Remove entity description mixin in Synology DSM (#112946)

homeassistant/components/synology_dsm/binary_sensor.py

@@ -28,7 +28,7 @@ from .entity import (
 from .models import SynologyDSMData
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class SynologyDSMBinarySensorEntityDescription(
     BinarySensorEntityDescription, SynologyDSMEntityDescription
 ):

homeassistant/components/synology_dsm/button.py

@@ -25,20 +25,13 @@ from .models import SynologyDSMData
 LOGGER = logging.getLogger(__name__)
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
-class SynologyDSMbuttonDescriptionMixin:
+class SynologyDSMbuttonDescription(ButtonEntityDescription):
-    """Mixin to describe a Synology DSM button entity."""
+    """Class to describe a Synology DSM button entity."""
 
     press_action: Callable[[SynoApi], Callable[[], Coroutine[Any, Any, None]]]
 
 
-@dataclass(frozen=True)
-class SynologyDSMbuttonDescription(
-    ButtonEntityDescription, SynologyDSMbuttonDescriptionMixin
-):
-    """Class to describe a Synology DSM button entity."""
-
-
 BUTTONS: Final = [
     SynologyDSMbuttonDescription(
         key="reboot",

homeassistant/components/synology_dsm/camera.py

@@ -36,7 +36,7 @@ from .models import SynologyDSMData
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class SynologyDSMCameraEntityDescription(
     CameraEntityDescription, SynologyDSMEntityDescription
 ):

homeassistant/components/synology_dsm/entity.py

@@ -19,18 +19,13 @@ from .coordinator import (
 _CoordinatorT = TypeVar("_CoordinatorT", bound=SynologyDSMUpdateCoordinator[Any])
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
-class SynologyDSMRequiredKeysMixin:
+class SynologyDSMEntityDescription(EntityDescription):
-    """Mixin for required keys."""
+    """Generic Synology DSM entity description."""
 
     api_key: str
 
 
-@dataclass(frozen=True)
-class SynologyDSMEntityDescription(EntityDescription, SynologyDSMRequiredKeysMixin):
-    """Generic Synology DSM entity description."""
-
-
 class SynologyDSMBaseEntity(CoordinatorEntity[_CoordinatorT]):
     """Representation of a Synology NAS entry."""
 

homeassistant/components/synology_dsm/sensor.py

@@ -40,7 +40,7 @@ from .entity import (
 from .models import SynologyDSMData
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class SynologyDSMSensorEntityDescription(
     SensorEntityDescription, SynologyDSMEntityDescription
 ):

homeassistant/components/synology_dsm/switch.py

@@ -23,7 +23,7 @@ from .models import SynologyDSMData
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class SynologyDSMSwitchEntityDescription(
     SwitchEntityDescription, SynologyDSMEntityDescription
 ):

homeassistant/components/synology_dsm/update.py

@@ -20,7 +20,7 @@ from .entity import SynologyDSMBaseEntity, SynologyDSMEntityDescription
 from .models import SynologyDSMData
 
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class SynologyDSMUpdateEntityEntityDescription(
     UpdateEntityDescription, SynologyDSMEntityDescription
 ):