Use runtime_data in flexit_bacnet (#138280)

homeassistant/components/flexit_bacnet/__init__.py

@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
-from .coordinator import FlexitCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
@@ -18,21 +16,18 @@ PLATFORMS: list[Platform] = [
 ]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: FlexitConfigEntry) -> bool:
     """Set up Flexit Nordic (BACnet) from a config entry."""
 
     coordinator = FlexitCoordinator(hass, entry)
     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: FlexitConfigEntry) -> bool:
     """Unload the Flexit Nordic (BACnet) config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok

homeassistant/components/flexit_bacnet/binary_sensor.py

@@ -10,12 +10,10 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FlexitCoordinator
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
-from .const import DOMAIN
 from .entity import FlexitEntity
 
 
@@ -38,11 +36,11 @@ SENSOR_TYPES: tuple[FlexitBinarySensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: FlexitConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) binary sensor from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitBinarySensor(coordinator, description) for description in SENSOR_TYPES

homeassistant/components/flexit_bacnet/climate.py

@@ -19,32 +19,28 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .const import (
-    DOMAIN,
     MAX_TEMP,
     MIN_TEMP,
     PRESET_TO_VENTILATION_MODE_MAP,
     VENTILATION_TO_PRESET_MODE_MAP,
 )
-from .coordinator import FlexitCoordinator
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
 from .entity import FlexitEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: FlexitConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Flexit Nordic unit."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities([FlexitClimateEntity(config_entry.runtime_data)])
-
-    async_add_entities([FlexitClimateEntity(coordinator)])
 
 
 class FlexitClimateEntity(FlexitEntity, ClimateEntity):

homeassistant/components/flexit_bacnet/coordinator.py

@@ -1,5 +1,7 @@
 """DataUpdateCoordinator for Flexit Nordic (BACnet) integration.."""
 
+from __future__ import annotations
+
 import asyncio.exceptions
 from datetime import timedelta
 import logging
@@ -17,13 +19,15 @@ from .const import DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
+type FlexitConfigEntry = ConfigEntry[FlexitCoordinator]
+
 
 class FlexitCoordinator(DataUpdateCoordinator[FlexitBACnet]):
     """Class to manage fetching data from a Flexit Nordic (BACnet) device."""
 
-    config_entry: ConfigEntry
+    config_entry: FlexitConfigEntry
 
-    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
+    def __init__(self, hass: HomeAssistant, config_entry: FlexitConfigEntry) -> None:
         """Initialize my coordinator."""
         super().__init__(
             hass,

homeassistant/components/flexit_bacnet/number.py

@@ -13,14 +13,12 @@ from homeassistant.components.number import (
     NumberEntityDescription,
     NumberMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FlexitCoordinator
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
-from .const import DOMAIN
 from .entity import FlexitEntity
 
 _MAX_FAN_SETPOINT = 100
@@ -196,11 +194,11 @@ NUMBERS: tuple[FlexitNumberEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: FlexitConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) number from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitNumber(coordinator, description) for description in NUMBERS

homeassistant/components/flexit_bacnet/sensor.py

@@ -11,7 +11,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     REVOLUTIONS_PER_MINUTE,
@@ -23,8 +22,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from . import FlexitCoordinator
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
-from .const import DOMAIN
 from .entity import FlexitEntity
 
 
@@ -152,11 +150,11 @@ SENSOR_TYPES: tuple[FlexitSensorEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: FlexitConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) sensor from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitSensor(coordinator, description) for description in SENSOR_TYPES

homeassistant/components/flexit_bacnet/switch.py

@@ -13,13 +13,11 @@ from homeassistant.components.switch import (
     SwitchEntity,
     SwitchEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import FlexitCoordinator
+from .coordinator import FlexitConfigEntry, FlexitCoordinator
-from .const import DOMAIN
 from .entity import FlexitEntity
 
 
@@ -59,11 +57,11 @@ SWITCHES: tuple[FlexitSwitchEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: FlexitConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Flexit (bacnet) switch from a config entry."""
-    coordinator: FlexitCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     async_add_entities(
         FlexitSwitch(coordinator, description) for description in SWITCHES