[lock] Use register_apply_condition for lock.is_locked and lock.is_unlocked (#19559)

esphome/components/lock/__init__.py

@@ -1,5 +1,5 @@
 from esphome import automation
-from esphome.automation import Condition, maybe_simple_id
+from esphome.automation import maybe_simple_id
 import esphome.codegen as cg
 from esphome.components import mqtt, web_server
 import esphome.config_validation as cv
@@ -34,7 +34,6 @@ LockAction = lock_ns.class_("LockAction", automation.Action)
 OpenAction = lock_ns.class_("OpenAction", automation.Action)
 LockPublishAction = lock_ns.class_("LockPublishAction", automation.Action)
 
-LockCondition = lock_ns.class_("LockCondition", Condition)
 LockStateForwarder = lock_ns.class_("LockStateForwarder")
 
 LockState = lock_ns.enum("LockState")
@@ -154,26 +153,14 @@ async def lock_action_to_code(
     return cg.new_Pvariable(action_id, template_arg, paren)
 
 
-@automation.register_condition("lock.is_locked", LockCondition, LOCK_ACTION_SCHEMA)
-async def lock_is_on_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(condition_id, template_arg, paren, True)
-
-
-@automation.register_condition("lock.is_unlocked", LockCondition, LOCK_ACTION_SCHEMA)
-async def lock_is_off_to_code(
-    config: ConfigType,
-    condition_id: ID,
-    template_arg: cg.TemplateArguments,
-    args: TemplateArgsType,
-) -> MockObj:
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(condition_id, template_arg, paren, False)
+automation.register_apply_condition(
+    "lock.is_locked", LOCK_ACTION_SCHEMA, f"state == {LockState.LOCK_STATE_LOCKED}"
+)
+automation.register_apply_condition(
+    "lock.is_unlocked",
+    LOCK_ACTION_SCHEMA,
+    f"state == {LockState.LOCK_STATE_UNLOCKED}",
+)
 
 
 @coroutine_with_priority(CoroPriority.CORE)

esphome/components/lock/automation.h

@@ -36,19 +36,6 @@ template<typename... Ts> class OpenAction final : public Action<Ts...> {
   Lock *lock_;
 };
 
-template<typename... Ts> class LockCondition final : public Condition<Ts...> {
- public:
-  LockCondition(Lock *parent, bool state) : parent_(parent), state_(state) {}
-  bool check(const Ts &...x) override {
-    auto check_state = this->state_ ? LockState::LOCK_STATE_LOCKED : LockState::LOCK_STATE_UNLOCKED;
-    return this->parent_->state == check_state;
-  }
-
- protected:
-  Lock *parent_;
-  bool state_;
-};
-
 /// Callback forwarder that triggers an Automation<> only when a specific lock state is entered.
 /// Pointer-sized (single Automation* field) to fit inline in Callback::ctx_.
 template<LockState State> struct LockStateForwarder {

tests/components/lock/common.yaml

@@ -4,6 +4,16 @@ esphome:
       - lock.lock: test_lock1
       - lock.unlock: test_lock1
       - lock.open: test_lock1
+      - if:
+          condition:
+            lock.is_locked: test_lock1
+          then:
+            - logger.log: locked
+      - if:
+          condition:
+            lock.is_unlocked: test_lock1
+          then:
+            - logger.log: unlocked
 
 output:
   - platform: gpio