[Code Driven]: #2 – Move Cluster Headers to Code driven style (project-chip#43203)

* closure-control: move code to new cluster headers while keeping backward

* Added shim files for backward compatibility

* updated copyright year for shim files

Author: pimpalemahesh

src/app/clusters/closure-control-server/ClosureControlCluster.cpp

@@ -19,7 +19,7 @@
 #include <app/CommandHandlerInterfaceRegistry.h>
 #include <app/ConcreteAttributePath.h>
 #include <app/InteractionModelEngine.h>
-#include <app/clusters/closure-control-server/closure-control-server.h>
+#include <app/clusters/closure-control-server/ClosureControlCluster.h>
 #include <app/util/attribute-storage.h>
 #include <lib/support/logging/CHIPLogging.h>
 

src/app/clusters/closure-control-server/ClosureControlCluster.h

@@ -0,0 +1,76 @@
+/*
+ *
+ *    Copyright (c) 2025 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app/AttributeAccessInterface.h>
+#include <app/CommandHandlerInterface.h>
+#include <app/ConcreteAttributePath.h>
+#include <app/clusters/closure-control-server/ClosureControlClusterLogic.h>
+#include <lib/core/CHIPError.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ClosureControl {
+
+/**
+ * @brief Closure Control cluster interface implementation
+ *        Applications should instantiate and init one Interface per endpoint
+ *
+ */
+class Interface : public AttributeAccessInterface, public CommandHandlerInterface
+{
+public:
+    Interface(EndpointId endpoint, ClusterLogic & clusterLogic) :
+        AttributeAccessInterface(Optional<EndpointId>(endpoint), Id), CommandHandlerInterface(Optional<EndpointId>(endpoint), Id),
+        mClusterLogic(clusterLogic)
+    {}
+
+    virtual ~Interface() = default;
+
+    // AttributeAccessInterface
+    CHIP_ERROR Read(const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder) override;
+
+    // CommandHandlerInterface
+    void InvokeCommand(HandlerContext & handlerContext) override;
+
+    /**
+     * @brief This function registers attribute access and command handler.
+     *
+     * @return CHIP_NO_ERROR when succesfully initialized.
+     *         Aborts if registration fails.
+     */
+    CHIP_ERROR Init();
+
+    /**
+     * @brief This function registers attribute access and command handler.
+     *
+     * @return CHIP_NO_ERROR when succesfully initialized.
+     *         Aborts if registration fails.
+     */
+    CHIP_ERROR Shutdown();
+
+private:
+    ClusterLogic & mClusterLogic;
+};
+
+} // namespace ClosureControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip

src/app/clusters/closure-control-server/ClosureControlClusterDelegate.h

@@ -0,0 +1,99 @@
+/**
+ *
+ *    Copyright (c) 2025 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include <app-common/zap-generated/cluster-enums.h>
+#include <protocols/interaction_model/StatusCode.h>
+
+namespace chip {
+namespace app {
+namespace Clusters {
+namespace ClosureControl {
+
+/** @brief Defines methods for implementing application-specific logic for the Closure Control Cluster.
+ */
+class DelegateBase
+{
+public:
+    DelegateBase()          = default;
+    virtual ~DelegateBase() = default;
+
+    /**
+     * @brief This function handles Stop command implementaion.
+     *
+     * @return Success when closure succesfully handles stop.
+     *         Error when stop fails.
+     */
+    virtual Protocols::InteractionModel::Status HandleStopCommand() = 0;
+
+    /**
+     * @brief This function handles MoveTo command implementaion.
+     *
+     * @param [in] position Target position to be set
+     * @param [in] latch Target Latch to be set
+     * @param [in] speed Target speed to be set
+     *
+     * @return Success when closure succesfully handles motion.
+     *         Error when motion fails.
+     */
+    virtual Protocols::InteractionModel::Status HandleMoveToCommand(const Optional<TargetPositionEnum> & position,
+                                                                    const Optional<bool> & latch,
+                                                                    const Optional<Globals::ThreeLevelAutoEnum> & speed) = 0;
+
+    /**
+     * @brief This function handles Calibrate command implementaion.
+     *
+     * @return Success when closure succesfully handles calibration.
+     *         Error when calibration fails.
+     */
+    virtual Protocols::InteractionModel::Status HandleCalibrateCommand() = 0;
+
+    /**
+     * @brief Checks whether the closure can move (as opposed to still needing pre-motion stages to complete).
+     *
+     * @return true if closure is ready to move
+     *         false if closure is not ready to move
+     */
+    virtual bool IsReadyToMove() = 0;
+
+    /**
+     * @brief Get the countdown time required by the closure for calibration.
+     *
+     * @return Time required for calibration action.
+     */
+    virtual ElapsedS GetCalibrationCountdownTime() = 0;
+
+    /**
+     * @brief Get the countdown time required by the closure for Motion.
+     *
+     * @return Time required for Motion action.
+     */
+    virtual ElapsedS GetMovingCountdownTime() = 0;
+
+    /**
+     * @brief Get the countdown time required by the closure for pre-stage before start of motion.
+     *
+     * @return Time required for Motion action.
+     */
+    virtual ElapsedS GetWaitingForMotionCountdownTime() = 0;
+};
+
+} // namespace ClosureControl
+} // namespace Clusters
+} // namespace app
+} // namespace chip

src/app/clusters/closure-control-server/ClosureControlClusterLogic.cpp

@@ -15,7 +15,7 @@
  *    limitations under the License.
  */
 
-#include <app/clusters/closure-control-server/closure-control-cluster-logic.h>
+#include <app/clusters/closure-control-server/ClosureControlClusterLogic.h>
 #include <clusters/ClosureControl/Metadata.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/LockTracker.h>