From 4aa61b0d640b8be26e0b8780c664f6bb28e40d27 Mon Sep 17 00:00:00 2001
From: Jan Bouwhuis <jbouwh@users.noreply.github.com>
Date: Tue, 7 Feb 2023 14:52:40 +0100
Subject: [PATCH] Cleanup remains of legacy validation MQTT light (#87467)

---
 .../components/mqtt/light/__init__.py          | 18 ++----------------
 .../components/mqtt/light/schema_basic.py      |  5 -----
 .../components/mqtt/light/schema_json.py       |  6 ------
 .../components/mqtt/light/schema_template.py   |  5 -----
 4 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/homeassistant/components/mqtt/light/__init__.py b/homeassistant/components/mqtt/light/__init__.py
index e7b2dcf5ae4..46d99388ff3 100644
--- a/homeassistant/components/mqtt/light/__init__.py
+++ b/homeassistant/components/mqtt/light/__init__.py
@@ -16,26 +16,23 @@ from ..mixins import async_setup_entry_helper, warn_for_legacy_schema
 from .schema import CONF_SCHEMA, MQTT_LIGHT_SCHEMA_SCHEMA
 from .schema_basic import (
     DISCOVERY_SCHEMA_BASIC,
-    PLATFORM_SCHEMA_BASIC,
     PLATFORM_SCHEMA_MODERN_BASIC,
     async_setup_entity_basic,
 )
 from .schema_json import (
     DISCOVERY_SCHEMA_JSON,
-    PLATFORM_SCHEMA_JSON,
     PLATFORM_SCHEMA_MODERN_JSON,
     async_setup_entity_json,
 )
 from .schema_template import (
     DISCOVERY_SCHEMA_TEMPLATE,
     PLATFORM_SCHEMA_MODERN_TEMPLATE,
-    PLATFORM_SCHEMA_TEMPLATE,
     async_setup_entity_template,
 )
 
 
 def validate_mqtt_light_discovery(config_value: dict[str, Any]) -> ConfigType:
-    """Validate MQTT light schema for."""
+    """Validate MQTT light schema for discovery."""
     schemas = {
         "basic": DISCOVERY_SCHEMA_BASIC,
         "json": DISCOVERY_SCHEMA_JSON,
@@ -45,19 +42,8 @@ def validate_mqtt_light_discovery(config_value: dict[str, Any]) -> ConfigType:
     return config
 
 
-def validate_mqtt_light(config_value: dict[str, Any]) -> ConfigType:
-    """Validate MQTT light schema."""
-    schemas = {
-        "basic": PLATFORM_SCHEMA_BASIC,
-        "json": PLATFORM_SCHEMA_JSON,
-        "template": PLATFORM_SCHEMA_TEMPLATE,
-    }
-    config: ConfigType = schemas[config_value[CONF_SCHEMA]](config_value)
-    return config
-
-
 def validate_mqtt_light_modern(config_value: dict[str, Any]) -> ConfigType:
-    """Validate MQTT light schema."""
+    """Validate MQTT light schema for setup from configuration.yaml."""
     schemas = {
         "basic": PLATFORM_SCHEMA_MODERN_BASIC,
         "json": PLATFORM_SCHEMA_MODERN_JSON,
diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py
index 4ff98d8bd77..153726a89e8 100644
--- a/homeassistant/components/mqtt/light/schema_basic.py
+++ b/homeassistant/components/mqtt/light/schema_basic.py
@@ -227,11 +227,6 @@ _PLATFORM_SCHEMA_BASE = (
     .extend(MQTT_LIGHT_SCHEMA_SCHEMA.schema)
 )
 
-# The use of PLATFORM_SCHEMA was deprecated in HA Core 2022.6
-PLATFORM_SCHEMA_BASIC = vol.All(
-    cv.PLATFORM_SCHEMA.extend(_PLATFORM_SCHEMA_BASE.schema),
-)
-
 DISCOVERY_SCHEMA_BASIC = vol.All(
     # CONF_WHITE_VALUE_* is no longer supported, support was removed in 2022.9
     cv.removed(CONF_WHITE_VALUE_COMMAND_TOPIC),
diff --git a/homeassistant/components/mqtt/light/schema_json.py b/homeassistant/components/mqtt/light/schema_json.py
index 0ba523c73f6..7a5921e6d20 100644
--- a/homeassistant/components/mqtt/light/schema_json.py
+++ b/homeassistant/components/mqtt/light/schema_json.py
@@ -156,12 +156,6 @@ _PLATFORM_SCHEMA_BASE = (
     .extend(MQTT_LIGHT_SCHEMA_SCHEMA.schema)
 )
 
-# Configuring MQTT Lights under the light platform key was deprecated in HA Core 2022.6
-PLATFORM_SCHEMA_JSON = vol.All(
-    cv.PLATFORM_SCHEMA.extend(_PLATFORM_SCHEMA_BASE.schema),
-    valid_color_configuration,
-)
-
 DISCOVERY_SCHEMA_JSON = vol.All(
     # CONF_WHITE_VALUE is no longer supported, support was removed in 2022.9
     cv.removed(CONF_WHITE_VALUE),
diff --git a/homeassistant/components/mqtt/light/schema_template.py b/homeassistant/components/mqtt/light/schema_template.py
index 654ca205a65..d0eaa31548d 100644
--- a/homeassistant/components/mqtt/light/schema_template.py
+++ b/homeassistant/components/mqtt/light/schema_template.py
@@ -110,11 +110,6 @@ _PLATFORM_SCHEMA_BASE = (
     .extend(MQTT_LIGHT_SCHEMA_SCHEMA.schema)
 )
 
-# Configuring MQTT Lights under the light platform key was deprecated in HA Core 2022.6
-PLATFORM_SCHEMA_TEMPLATE = vol.All(
-    cv.PLATFORM_SCHEMA.extend(_PLATFORM_SCHEMA_BASE.schema),
-)
-
 DISCOVERY_SCHEMA_TEMPLATE = vol.All(
     # CONF_WHITE_VALUE_TEMPLATE is no longer supported, support was removed in 2022.9
     cv.removed(CONF_WHITE_VALUE_TEMPLATE),