From f01598aaddc96721c1746173554f2b329dbb1f46 Mon Sep 17 00:00:00 2001
From: tronikos <tronikos@users.noreply.github.com>
Date: Sat, 18 Jan 2025 02:14:31 -0800
Subject: [PATCH] Use runtime_data in Opower (#135910)

* Use runtime_data in Opower

* Fix async_unload_entry

* Fix async_unload_entry

* fix
---
 homeassistant/components/opower/__init__.py | 15 +++++++--------
 homeassistant/components/opower/sensor.py   |  8 +++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/opower/__init__.py b/homeassistant/components/opower/__init__.py
index 1a34d0547aa..136a1a4e57a 100644
--- a/homeassistant/components/opower/__init__.py
+++ b/homeassistant/components/opower/__init__.py
@@ -6,27 +6,26 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
 from .coordinator import OpowerCoordinator
 
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+type OpowerConfigEntry = ConfigEntry[OpowerCoordinator]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: OpowerConfigEntry) -> bool:
     """Set up Opower from a config entry."""
 
     coordinator = OpowerCoordinator(hass, entry.data)
     await coordinator.async_config_entry_first_refresh()
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: OpowerConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/opower/sensor.py b/homeassistant/components/opower/sensor.py
index 05a22dfbf1b..7f8eb22d1e6 100644
--- a/homeassistant/components/opower/sensor.py
+++ b/homeassistant/components/opower/sensor.py
@@ -13,7 +13,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory, UnitOfEnergy, UnitOfVolume
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
@@ -21,6 +20,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from . import OpowerConfigEntry
 from .const import DOMAIN
 from .coordinator import OpowerCoordinator
 
@@ -183,11 +183,13 @@ GAS_SENSORS: tuple[OpowerEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: OpowerConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Opower sensor."""
 
-    coordinator: OpowerCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     entities: list[OpowerSensor] = []
     forecasts = coordinator.data.values()
     for forecast in forecasts: