Merge from master

Author: raul-marquez-csa

.github/workflows/lint.yml

@@ -42,6 +42,144 @@ jobs:
               with:
                 platform: linux
 
+            - name: Check for orphaned gn files
+              if: always()
+              # We should enforce that ALL new files are referenced in our build scripts.
+              # Several things do not have a clear fix path:
+              #   - various platform implementations (including darwin-specific files as they
+              #     are not using GN)
+              #   - app/clusters (they are fetched dynamically - this should probably be fixed)
+              #
+              # All the rest of the exceptions should be driven down to 0: chip should fully
+              # be defined in build rules.
+              #
+              # This check enforces that for any newly added file, it must be part of some
+              # BUILD.gn file
+              run: |
+                  ./scripts/run_in_build_env.sh "./scripts/tools/not_known_to_gn.py \
+                     src \
+                     --skip-dir app/clusters \
+                     --skip-dir darwin \
+                     --skip-dir include \
+                     --skip-dir platform/Ameba \
+                     --skip-dir platform/android \
+                     --skip-dir platform/ASR \
+                     --skip-dir platform/Beken \
+                     --skip-dir platform/bouffalolab \
+                     --skip-dir platform/cc13xx_26xx \
+                     --skip-dir platform/cc32xx \
+                     --skip-dir platform/Darwin \
+                     --skip-dir platform/ESP32 \
+                     --skip-dir platform/fake \
+                     --skip-dir platform/FreeRTOS \
+                     --skip-dir platform/Infineon \
+                     --skip-dir platform/Linux \
+                     --skip-dir platform/mbed \
+                     --skip-dir platform/mt793x \
+                     --skip-dir platform/nxp \
+                     --skip-dir platform/OpenThread \
+                     --skip-dir platform/qpg \
+                     --skip-dir platform/silabs \
+                     --skip-dir platform/telink \
+                     --skip-dir platform/webos \
+                     --skip-dir platform/Zephyr \
+                     --skip-dir test_driver \
+                     --known-failure app/app-platform/ContentApp.cpp \
+                     --known-failure app/app-platform/ContentApp.h \
+                     --known-failure app/app-platform/ContentAppPlatform.cpp \
+                     --known-failure app/app-platform/ContentAppPlatform.h \
+                     --known-failure controller/ExamplePersistentStorage.cpp \
+                     --known-failure controller/ExamplePersistentStorage.h \
+                     --known-failure controller/java/GroupDeviceProxy.h \
+                     --known-failure controller/java/CHIPEventTLVValueDecoder.h \
+                     --known-failure controller/python/chip/credentials/cert.h \
+                     --known-failure controller/python/chip/server/Options.h \
+                     --known-failure controller/python/chip/crypto/p256keypair.h \
+                     --known-failure controller/python/chip/commissioning/PlaceholderOperationalCredentialsIssuer.h \
+                     --known-failure controller/python/chip/native/PyChipError.h \
+                     --known-failure app/AttributeAccessInterface.h \
+                     --known-failure app/AttributeAccessToken.h \
+                     --known-failure app/att-storage.h \
+                     --known-failure app/BufferedReadCallback.h \
+                     --known-failure app/CommandHandler.h \
+                     --known-failure app/CommandHandlerInterface.h \
+                     --known-failure app/CommandPathParams.h \
+                     --known-failure app/CommandPathRegistry.h \
+                     --known-failure app/CommandResponseSender.h \
+                     --known-failure app/CommandSender.h \
+                     --known-failure app/CommandSenderLegacyCallback.h \
+                     --known-failure app/CompatEnumNames.h \
+                     --known-failure app/ConcreteAttributePath.h \
+                     --known-failure app/ConcreteCommandPath.h \
+                     --known-failure app/data-model/ListLargeSystemExtensions.h \
+                     --known-failure app/EventHeader.h \
+                     --known-failure app/EventLoggingDelegate.h \
+                     --known-failure app/EventLogging.h \
+                     --known-failure app/EventLoggingTypes.h \
+                     --known-failure app/EventManagement.h \
+                     --known-failure app/InteractionModelHelper.h \
+                     --known-failure app/ObjectList.h \
+                     --known-failure app/ReadClient.h \
+                     --known-failure app/ReadHandler.h \
+                     --known-failure app/ReadPrepareParams.h \
+                     --known-failure app/reporting/tests/MockReportScheduler.cpp \
+                     --known-failure app/reporting/tests/MockReportScheduler.h \
+                     --known-failure app/server/AppDelegate.h \
+                     --known-failure app/TestEventTriggerDelegate.h \
+                     --known-failure app/tests/integration/common.h \
+                     --known-failure app/tests/integration/MockEvents.h \
+                     --known-failure app/tests/suites/credentials/TestHarnessDACProvider.h \
+                     --known-failure app/tests/TestOperationalDeviceProxy.cpp \
+                     --known-failure app/util/af-enums.h \
+                     --known-failure app/util/af.h \
+                     --known-failure app/util/af-types.h \
+                     --known-failure app/util/attribute-metadata.h \
+                     --known-failure app/util/attribute-storage.cpp \
+                     --known-failure app/util/attribute-storage.h \
+                     --known-failure app/util/attribute-storage-null-handling.h \
+                     --known-failure app/util/attribute-table.cpp \
+                     --known-failure app/util/attribute-table.h \
+                     --known-failure app/util/binding-table.cpp \
+                     --known-failure app/util/binding-table.h \
+                     --known-failure app/util/common.h \
+                     --known-failure app/util/config.h \
+                     --known-failure app/util/DataModelHandler.cpp \
+                     --known-failure app/util/DataModelHandler.h \
+                     --known-failure app/util/ember-compatibility-functions.cpp \
+                     --known-failure app/util/endpoint-config-api.h \
+                     --known-failure app/util/endpoint-config-defines.h \
+                     --known-failure app/util/error-mapping.h \
+                     --known-failure app/util/generic-callbacks.h \
+                     --known-failure app/util/generic-callback-stubs.cpp \
+                     --known-failure app/util/im-client-callbacks.h \
+                     --known-failure app/util/MatterCallbacks.h \
+                     --known-failure app/util/message.cpp \
+                     --known-failure app/util/mock/Constants.h \
+                     --known-failure app/util/mock/Functions.h \
+                     --known-failure app/util/mock/MockNodeConfig.h \
+                     --known-failure app/util/odd-sized-integers.h \
+                     --known-failure app/util/types_stub.h \
+                     --known-failure app/util/util.cpp \
+                     --known-failure app/util/util.h \
+                     --known-failure app/WriteClient.h \
+                     --known-failure app/WriteHandler.h \
+                     --known-failure inet/tests/TestInetLayerCommon.hpp \
+                     --known-failure lib/core/CHIPVendorIdentifiers.hpp \
+                     --known-failure lib/dnssd/Constants.h \
+                     --known-failure lib/dnssd/minimal_mdns/core/FlatAllocatedQName.h \
+                     --known-failure lib/dnssd/minimal_mdns/core/HeapQName.h \
+                     --known-failure lib/dnssd/minimal_mdns/ListenIterator.h \
+                     --known-failure lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h \
+                     --known-failure lib/dnssd/platform/DnssdBrowseDelegate.h \
+                     --known-failure lib/support/CHIPArgParser.hpp \
+                     --known-failure messaging/tests/echo/common.h \
+                     --known-failure platform/DeviceSafeQueue.cpp \
+                     --known-failure platform/DeviceSafeQueue.h \
+                     --known-failure platform/GLibTypeDeleter.h \
+                     --known-failure platform/SingletonConfigurationManager.cpp \
+                     --known-failure transport/retransmit/tests/TestCacheDriver.cpp \
+                  "
+
             - name: Check for matter lint errors
               if: always()
               run: |

examples/all-clusters-app/all-clusters-common/include/rvc-operational-state-delegate-impl.h

@@ -90,18 +90,6 @@ class RvcOperationalStateDelegate : public Delegate
      */
     void HandleResumeStateCallback(OperationalState::GenericOperationalError & err) override;
 
-    /**
-     * Handle Command Callback in application: Start
-     * @param[out] get operational error after callback.
-     */
-    void HandleStartStateCallback(OperationalState::GenericOperationalError & err) override;
-
-    /**
-     * Handle Command Callback in application: Stop
-     * @param[out] get operational error after callback.
-     */
-    void HandleStopStateCallback(OperationalState::GenericOperationalError & err) override;
-
     /**
      * Handle the GoHome command.
      * @param err

examples/all-clusters-app/all-clusters-common/include/static-supported-modes-manager.h

@@ -50,7 +50,7 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp
     };
 
     static storage_value_type coffeeOptions[];
-    static const EndpointSpanPair supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT];
+    static const EndpointSpanPair supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT];
 
 public:
     static const StaticSupportedModesManager instance;

examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h

@@ -49,7 +49,7 @@ class AppSupportedTemperatureLevelsDelegate : public SupportedTemperatureLevelsI
     static CharSpan temperatureLevelOptions[3];
 
 public:
-    static const EndpointPair supportedOptionsByEndpoints[EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT];
+    static const EndpointPair supportedOptionsByEndpoints[MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT];
 
     uint8_t Size() override;
 

examples/all-clusters-app/all-clusters-common/src/rvc-operational-state-delegate-impl.cpp

@@ -70,34 +70,6 @@ void RvcOperationalStateDelegate::HandleResumeStateCallback(OperationalState::Ge
     }
 }
 
-void RvcOperationalStateDelegate::HandleStartStateCallback(OperationalState::GenericOperationalError & err)
-{
-    // placeholder implementation
-    auto error = GetInstance()->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kRunning));
-    if (error == CHIP_NO_ERROR)
-    {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError));
-    }
-    else
-    {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation));
-    }
-}
-
-void RvcOperationalStateDelegate::HandleStopStateCallback(OperationalState::GenericOperationalError & err)
-{
-    // placeholder implementation
-    auto error = GetInstance()->SetOperationalState(to_underlying(OperationalState::OperationalStateEnum::kStopped));
-    if (error == CHIP_NO_ERROR)
-    {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kNoError));
-    }
-    else
-    {
-        err.Set(to_underlying(OperationalState::ErrorStateEnum::kUnableToCompleteOperation));
-    }
-}
-
 void RvcOperationalStateDelegate::HandleGoHomeCommandCallback(OperationalState::GenericOperationalError & err)
 {
     // placeholder implementation

examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp

@@ -35,7 +35,7 @@ storage_value_type StaticSupportedModesManager::coffeeOptions[] = {
     buildModeOptionStruct("Espresso", 7, List<const SemanticTag>(semanticTagsEspresso))
 };
 const StaticSupportedModesManager::EndpointSpanPair
-    StaticSupportedModesManager::supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = {
+    StaticSupportedModesManager::supportedOptionsByEndpoints[MATTER_DM_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = {
         EndpointSpanPair(1, Span<storage_value_type>(StaticSupportedModesManager::coffeeOptions)) // Options for Endpoint 1
     };
 

examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp

@@ -30,7 +30,7 @@ CharSpan AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions[] = { Ch
                                                                               CharSpan("Freezing", 8) };
 
 const AppSupportedTemperatureLevelsDelegate::EndpointPair AppSupportedTemperatureLevelsDelegate::supportedOptionsByEndpoints
-    [EMBER_AF_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = {
+    [MATTER_DM_TEMPERATURE_CONTROL_CLUSTER_SERVER_ENDPOINT_COUNT] = {
         EndpointPair(1, AppSupportedTemperatureLevelsDelegate::temperatureLevelOptions, 3) // Options for Endpoint 1
     };
 

examples/all-clusters-app/linux/include/CHIPProjectAppConfig.h

@@ -41,7 +41,7 @@
 #define CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONABLE_DEVICE_TYPE 1
 
 // Marks that a ModeBase Derived cluster is being used.
-#define EMBER_AF_PLUGIN_MODE_BASE
+#define MATTER_DM_PLUGIN_MODE_BASE
 
 // Enable batching of up to 5 commands.
 #define CHIP_CONFIG_MAX_PATHS_PER_INVOKE 5

examples/all-clusters-app/linux/main-common.cpp

@@ -104,7 +104,7 @@ const Clusters::Descriptor::Structs::SemanticTagStruct::Type gEp2TagList[] = {
 };
 } // namespace
 
-#ifdef EMBER_AF_PLUGIN_DISHWASHER_ALARM_SERVER
+#ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER
 extern void MatterDishwasherAlarmServerInit();
 #endif
 
@@ -225,7 +225,7 @@ void ApplicationInit()
         SetDeviceInstanceInfoProvider(&gExampleDeviceInstanceInfoProvider);
     }
 
-#ifdef EMBER_AF_PLUGIN_DISHWASHER_ALARM_SERVER
+#ifdef MATTER_DM_PLUGIN_DISHWASHER_ALARM_SERVER
     MatterDishwasherAlarmServerInit();
 #endif
     Clusters::TemperatureControl::SetInstance(&sAppSupportedTemperatureLevelsDelegate);

examples/android/CHIPTest/app/src/main/cpp/CHIPTest-JNI.cpp

@@ -63,10 +63,15 @@ jint JNI_OnLoad(JavaVM * jvm, void * reserved)
     ChipLogProgress(Test, "Loading Java class references.");
 
     // Get various class references need by the API.
-    err = JniReferences::GetInstance().GetClassRef(env, "com/tcl/chip/chiptest/TestEngine", sTestEngineCls);
+    jobject testEngineCls;
+    err = JniReferences::GetInstance().GetLocalClassRef(env, "com/tcl/chip/chiptest/TestEngine", sTestEngineCls);
     SuccessOrExit(err);
-
-    err = JniReferences::GetInstance().GetClassRef(env, "com/tcl/chip/chiptest/TestEngineException", sTestEngineExceptionCls);
+    err = sTestEngineCls.Init(testEngineCls);
+    SuccessOrExit(err);
+    jobject testEngineExceptionCls;
+    err = JniReferences::GetInstance().GetLocalClassRef(env, "com/tcl/chip/chiptest/TestEngineException", sTestEngineExceptionCls);
+    SuccessOrExit(err);
+    err = sTestEngineExceptionCls.Init(testEngineExceptionCls);
     SuccessOrExit(err);
     ChipLogProgress(Test, "Java class references loaded.");
 
@@ -141,7 +146,7 @@ CHIP_ERROR N2J_Error(JNIEnv * env, CHIP_ERROR inErr, jthrowable & outEx)
     jmethodID constructor;
 
     env->ExceptionClear();
-    constructor = env->GetMethodID(sTestEngineExceptionCls, "<init>", "(ILjava/lang/String;)V");
+    constructor = env->GetMethodID(sTestEngineExceptionCls.ObjectRef(), "<init>", "(ILjava/lang/String;)V");
     VerifyOrExit(constructor != NULL, err = CHIP_JNI_ERROR_METHOD_NOT_FOUND);
 
     switch (inErr.AsInteger())
@@ -164,7 +169,8 @@ CHIP_ERROR N2J_Error(JNIEnv * env, CHIP_ERROR inErr, jthrowable & outEx)
     }
     errStrObj = (errStr != NULL) ? env->NewStringUTF(errStr) : NULL;
 
-    outEx = (jthrowable) env->NewObject(sTestEngineExceptionCls, constructor, static_cast<jint>(inErr.AsInteger()), errStrObj);
+    outEx = (jthrowable) env->NewObject(sTestEngineExceptionCls.ObjectRef(), constructor, static_cast<jint>(inErr.AsInteger()),
+                                        errStrObj);
     VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
 exit:
@@ -184,7 +190,7 @@ static void onLog(const char * fmt, ...)
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
     VerifyOrExit(env != NULL, err = CHIP_JNI_ERROR_NO_ENV);
 
-    method = env->GetStaticMethodID(sTestEngineCls, "onTestLog", "(Ljava/lang/String;)V");
+    method = env->GetStaticMethodID(sTestEngineCls.ObjectRef(), "onTestLog", "(Ljava/lang/String;)V");
     VerifyOrExit(method != NULL, err = CHIP_JNI_ERROR_NO_ENV);
 
     va_start(args, fmt);
@@ -195,7 +201,7 @@ static void onLog(const char * fmt, ...)
     ChipLogProgress(Test, "Calling Java onTestLog");
 
     env->ExceptionClear();
-    env->CallStaticVoidMethod(sTestEngineCls, method, strObj);
+    env->CallStaticVoidMethod(sTestEngineCls.ObjectRef(), method, strObj);
     VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
 exit:

examples/chef/common/chef-air-quality.cpp

@@ -25,7 +25,7 @@ using namespace chip;
 using namespace chip::app;
 using namespace chip::app::Clusters;
 
-#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER
+#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER
 #include <app/clusters/air-quality-server/air-quality-server.h>
 using namespace chip::app::Clusters::AirQuality;
 

examples/chef/common/chef-air-quality.h

@@ -21,7 +21,7 @@
 #include <app/util/config.h>
 #include <lib/core/DataModelTypes.h>
 
-#ifdef EMBER_AF_PLUGIN_AIR_QUALITY_SERVER
+#ifdef MATTER_DM_PLUGIN_AIR_QUALITY_SERVER
 EmberAfStatus chefAirQualityWriteCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
                                           const EmberAfAttributeMetadata * attributeMetadata, uint8_t * buffer);
 EmberAfStatus chefAirQualityReadCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,

examples/chef/common/chef-channel-manager.cpp

@@ -23,7 +23,7 @@ using ChangeChannelResponseType = chip::app::Clusters::Channel::Commands::Change
 using ChannelInfoType           = chip::app::Clusters::Channel::Structs::ChannelInfoStruct::Type;
 using LineupInfoType            = chip::app::Clusters::Channel::Structs::LineupInfoStruct::Type;
 // Include Channel Cluster Server callbacks only when the server is enabled
-#ifdef EMBER_AF_PLUGIN_CHANNEL_SERVER
+#ifdef MATTER_DM_PLUGIN_CHANNEL_SERVER
 #include <chef-channel-manager.h>
 
 using namespace chip;
@@ -213,7 +213,7 @@ bool ChefChannelManager::HandleSkipChannel(const int16_t & count)
 
 uint32_t ChefChannelManager::GetFeatureMap(chip::EndpointId endpoint)
 {
-    if (endpoint > EMBER_AF_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT)
+    if (endpoint > MATTER_DM_CHANNEL_CLUSTER_SERVER_ENDPOINT_COUNT)
     {
         return 0;
     }
@@ -223,4 +223,4 @@ uint32_t ChefChannelManager::GetFeatureMap(chip::EndpointId endpoint)
     return featureMap;
 }
 
-#endif /* EMBER_AF_PLUGIN_CHANNEL_SERVER */
+#endif /* MATTER_DM_PLUGIN_CHANNEL_SERVER */