Remove intermediate CRTP layer from DeviceNetworkProvisioningDelegate

project-chip · Nov 1, 2022 · 0d1314e · 0d1314e
1 parent 16f49ea
commit 0d1314e
Show file tree

Hide file tree

Showing 46 changed files with 144 additions and 415 deletions.
diff --git a/...form/internal/DeviceNetworkProvisioning.h → ...ernal/DeviceNetworkProvisioningDelegate.h b/...form/internal/DeviceNetworkProvisioning.h → ...ernal/DeviceNetworkProvisioningDelegate.h
@@ -24,6 +24,7 @@
 #pragma once
 
 #include <lib/core/CHIPCore.h>
+#include <platform/internal/CHIPDeviceLayerInternal.h>
 #include <platform/internal/DeviceNetworkInfo.h>
 
 namespace chip {

diff --git a/src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h b/src/include/platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h
diff --git a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -25,7 +25,7 @@
 namespace chip {
 namespace DeviceLayer {
 
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 

diff --git a/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Ameba/DeviceNetworkProvisioningDelegateImpl.h
@@ -18,26 +18,16 @@
 
 #pragma once
 
-#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/internal/DeviceNetworkProvisioningDelegate.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-namespace Internal {
-
-template <class ImplClass>
-class GenericDeviceNetworkProvisioningDelegateImpl;
-
-} // namespace Internal
-
-class DeviceNetworkProvisioningDelegateImpl final
-    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate
 {
-private:
-    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
-
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd);
-    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; }
+public:
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override;
+    CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
 };
 
 } // namespace DeviceLayer

diff --git a/src/platform/BUILD.gn b/src/platform/BUILD.gn
@@ -343,7 +343,7 @@ if (chip_device_platform != "none") {
       "../include/platform/internal/BLEManager.h",
       "../include/platform/internal/CHIPDeviceLayerInternal.h",
       "../include/platform/internal/DeviceNetworkInfo.h",
-      "../include/platform/internal/DeviceNetworkProvisioning.h",
+      "../include/platform/internal/DeviceNetworkProvisioningDelegate.h",
       "../include/platform/internal/EventLogging.h",
       "../include/platform/internal/GenericConfigurationManagerImpl.h",
       "../include/platform/internal/GenericConfigurationManagerImpl.ipp",

diff --git a/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Darwin/DeviceNetworkProvisioningDelegateImpl.h
@@ -17,26 +17,16 @@
 
 #pragma once
 
-#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/internal/DeviceNetworkProvisioningDelegate.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-namespace Internal {
-
-template <class ImplClass>
-class GenericDeviceNetworkProvisioningDelegateImpl;
-
-} // namespace Internal
-
-class DeviceNetworkProvisioningDelegateImpl final
-    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate
 {
-    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
-
-private:
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; }
+public:
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
 };
 
 } // namespace DeviceLayer

diff --git a/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -28,7 +28,7 @@ namespace chip {
 namespace DeviceLayer {
 
 CHIP_ERROR
-DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData)
+DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData)
 {
 #if CHIP_ENABLE_OPENTHREAD
     CHIP_ERROR error = CHIP_NO_ERROR;
@@ -44,7 +44,7 @@ DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadDa
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 

diff --git a/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/EFR32/DeviceNetworkProvisioningDelegateImpl.h
@@ -17,30 +17,20 @@
 
 #pragma once
 
-#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/internal/DeviceNetworkProvisioningDelegate.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-namespace Internal {
-
-template <class ImplClass>
-class GenericDeviceNetworkProvisioningDelegateImpl;
-
-} // namespace Internal
-
-class DeviceNetworkProvisioningDelegateImpl final
-    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate
 {
-    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
-
-private:
+public:
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd);
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override;
 #else
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
 #endif
-    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData);
+    CHIP_ERROR ProvisionThread(ByteSpan threadData) override;
 };
 
 } // namespace DeviceLayer

diff --git a/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -24,7 +24,7 @@
 namespace chip {
 namespace DeviceLayer {
 
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key)
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -40,7 +40,7 @@ CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const ch
 #endif
 }
 
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData)
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     CHIP_ERROR err = CHIP_NO_ERROR;

diff --git a/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/ESP32/DeviceNetworkProvisioningDelegateImpl.h
@@ -17,26 +17,16 @@
 
 #pragma once
 
-#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/internal/DeviceNetworkProvisioningDelegate.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-namespace Internal {
-
-template <class ImplClass>
-class GenericDeviceNetworkProvisioningDelegateImpl;
-
-} // namespace Internal
-
-class DeviceNetworkProvisioningDelegateImpl final
-    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate
 {
-private:
-    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
-
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd);
-    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData);
+public:
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override;
+    CHIP_ERROR ProvisionThread(ByteSpan threadData) override;
 };
 
 } // namespace DeviceLayer

diff --git a/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -20,7 +20,7 @@
 namespace chip {
 namespace DeviceLayer {
 
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionThreadNetwork(ByteSpan threadData)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionThread(ByteSpan threadData)
 {
 #if CHIP_DEVICE_CONFIG_ENABLE_THREAD
     CHIP_ERROR error = CHIP_NO_ERROR;

diff --git a/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Infineon/CYW30739/DeviceNetworkProvisioningDelegateImpl.h
@@ -17,26 +17,16 @@
 
 #pragma once
 
-#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/internal/DeviceNetworkProvisioningDelegate.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-namespace Internal {
-
-template <class ImplClass>
-class GenericDeviceNetworkProvisioningDelegateImpl;
-
-} // namespace Internal
-
-class DeviceNetworkProvisioningDelegateImpl final
-    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate
 {
-    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
-
-private:
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd) { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData);
+public:
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
+    CHIP_ERROR ProvisionThread(ByteSpan threadData) override;
 };
 
 } // namespace DeviceLayer

diff --git a/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -24,7 +24,7 @@
 namespace chip {
 namespace DeviceLayer {
 
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * passwd)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * passwd)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 

diff --git a/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Infineon/PSOC6/DeviceNetworkProvisioningDelegateImpl.h
@@ -17,26 +17,16 @@
 
 #pragma once
 
-#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/internal/DeviceNetworkProvisioningDelegate.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-namespace Internal {
-
-template <class ImplClass>
-class GenericDeviceNetworkProvisioningDelegateImpl;
-
-} // namespace Internal
-
-class DeviceNetworkProvisioningDelegateImpl final
-    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate
 {
-private:
-    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
-
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd);
-    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; }
+public:
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override;
+    CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
 };
 
 } // namespace DeviceLayer

diff --git a/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -23,7 +23,7 @@
 namespace chip {
 namespace DeviceLayer {
 
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 

diff --git a/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.h b/src/platform/Linux/DeviceNetworkProvisioningDelegateImpl.h
@@ -17,26 +17,19 @@
 
 #pragma once
 
-#include <platform/internal/GenericDeviceNetworkProvisioningDelegateImpl.h>
+#include <platform/internal/DeviceNetworkProvisioningDelegate.h>
 
 namespace chip {
 namespace DeviceLayer {
 
-namespace Internal {
-
-template <class ImplClass>
-class GenericDeviceNetworkProvisioningDelegateImpl;
-
-} // namespace Internal
-
-class DeviceNetworkProvisioningDelegateImpl final
-    : public Internal::GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>
+/**
+ * Concrete implementation of the DeviceNetworkProvisioningDelegate for Linux platforms.
+ */
+class DeviceNetworkProvisioningDelegateImpl final : public Internal::DeviceNetworkProvisioningDelegate
 {
-    friend class GenericDeviceNetworkProvisioningDelegateImpl<DeviceNetworkProvisioningDelegateImpl>;
-
-private:
-    CHIP_ERROR _ProvisionWiFiNetwork(const char * ssid, const char * passwd);
-    CHIP_ERROR _ProvisionThreadNetwork(ByteSpan threadData) { return CHIP_ERROR_NOT_IMPLEMENTED; }
+public:
+    CHIP_ERROR ProvisionWiFi(const char * ssid, const char * passwd) override;
+    CHIP_ERROR ProvisionThread(ByteSpan threadData) override { return CHIP_ERROR_NOT_IMPLEMENTED; }
 };
 
 } // namespace DeviceLayer

diff --git a/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.cpp b/src/platform/Tizen/DeviceNetworkProvisioningDelegateImpl.cpp
@@ -23,7 +23,7 @@
 namespace chip {
 namespace DeviceLayer {
 
-CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::_ProvisionWiFiNetwork(const char * ssid, const char * key)
+CHIP_ERROR DeviceNetworkProvisioningDelegateImpl::ProvisionWiFi(const char * ssid, const char * key)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;