diff --git a/homeassistant/components/mqtt/vacuum/__init__.py b/homeassistant/components/mqtt/vacuum/__init__.py index 366a7dca159..86d94883c90 100644 --- a/homeassistant/components/mqtt/vacuum/__init__.py +++ b/homeassistant/components/mqtt/vacuum/__init__.py @@ -15,13 +15,11 @@ from ..mixins import async_setup_entry_helper, warn_for_legacy_schema from .schema import CONF_SCHEMA, LEGACY, MQTT_VACUUM_SCHEMA, STATE from .schema_legacy import ( DISCOVERY_SCHEMA_LEGACY, - PLATFORM_SCHEMA_LEGACY, PLATFORM_SCHEMA_LEGACY_MODERN, async_setup_entity_legacy, ) from .schema_state import ( DISCOVERY_SCHEMA_STATE, - PLATFORM_SCHEMA_STATE, PLATFORM_SCHEMA_STATE_MODERN, async_setup_entity_state, ) @@ -34,15 +32,6 @@ def validate_mqtt_vacuum_discovery(config_value: ConfigType) -> ConfigType: return config -# Configuring MQTT Vacuums under the vacuum platform key was deprecated in -# HA Core 2022.6 -def validate_mqtt_vacuum(config_value: ConfigType) -> ConfigType: - """Validate MQTT vacuum schema (deprecated).""" - schemas = {LEGACY: PLATFORM_SCHEMA_LEGACY, STATE: PLATFORM_SCHEMA_STATE} - config: ConfigType = schemas[config_value[CONF_SCHEMA]](config_value) - return config - - def validate_mqtt_vacuum_modern(config_value: ConfigType) -> ConfigType: """Validate MQTT vacuum modern schema.""" schemas = { diff --git a/homeassistant/components/mqtt/vacuum/schema_legacy.py b/homeassistant/components/mqtt/vacuum/schema_legacy.py index 39b734235a0..8a2912f1910 100644 --- a/homeassistant/components/mqtt/vacuum/schema_legacy.py +++ b/homeassistant/components/mqtt/vacuum/schema_legacy.py @@ -161,9 +161,9 @@ PLATFORM_SCHEMA_LEGACY_MODERN = ( ) # Configuring MQTT Vacuums under the vacuum platform key was deprecated in -# HA Core 2022.6 +# HA Core 2022.6; +# Setup for the legacy YAML format was removed in HA Core 2022.12 PLATFORM_SCHEMA_LEGACY = vol.All( - cv.PLATFORM_SCHEMA.extend(PLATFORM_SCHEMA_LEGACY_MODERN.schema), warn_for_legacy_schema(VACUUM_DOMAIN), ) diff --git a/homeassistant/components/mqtt/vacuum/schema_state.py b/homeassistant/components/mqtt/vacuum/schema_state.py index 3a5d267a5d4..eed8d98bd34 100644 --- a/homeassistant/components/mqtt/vacuum/schema_state.py +++ b/homeassistant/components/mqtt/vacuum/schema_state.py @@ -155,9 +155,9 @@ PLATFORM_SCHEMA_STATE_MODERN = ( ) # Configuring MQTT Vacuums under the vacuum platform key was deprecated in -# HA Core 2022.6 +# HA Core 2022.6; +# Setup for the legacy YAML format was removed in HA Core 2022.12 PLATFORM_SCHEMA_STATE = vol.All( - cv.PLATFORM_SCHEMA.extend(PLATFORM_SCHEMA_STATE_MODERN.schema), warn_for_legacy_schema(VACUUM_DOMAIN), )