relocate/rename PersistentStorage to ExamplePersistentStorage

Java matter controller app test needs the example persistent storage, relocate the PersistentStorage from examples/chip-tool to src/controller, and put it nearby ExampleOperationalCredential
project-chip · Nov 19, 2022 · a80cf0c · a80cf0c
1 parent 76d834e
commit a80cf0c
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/examples/chip-tool/commands/clusters/ModelCommand.h b/examples/chip-tool/commands/clusters/ModelCommand.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #ifdef CONFIG_USE_LOCAL_STORAGE
-#include "../../config/PersistentStorage.h"
+#include <controller/ExamplePersistentStorage.h>
 #endif // CONFIG_USE_LOCAL_STORAGE
 
 #include "../common/CHIPCommand.h"

diff --git a/examples/chip-tool/commands/common/Commands.h b/examples/chip-tool/commands/common/Commands.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #ifdef CONFIG_USE_LOCAL_STORAGE
-#include "../../config/PersistentStorage.h"
+#include <controller/ExamplePersistentStorage.h>
 #endif // CONFIG_USE_LOCAL_STORAGE
 
 #include "Command.h"

diff --git a/examples/chip-tool/commands/pairing/CommissionedListCommand.h b/examples/chip-tool/commands/pairing/CommissionedListCommand.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#include "../../config/PersistentStorage.h"
 #include "../common/Command.h"
+#include <controller/ExamplePersistentStorage.h>
 
 class CommissionedListCommand : public Command
 {

diff --git a/examples/chip-tool/commands/storage/StorageManagementCommand.cpp b/examples/chip-tool/commands/storage/StorageManagementCommand.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "../../config/PersistentStorage.h"
+#include <controller/ExamplePersistentStorage.h>
 
 #include "StorageManagementCommand.h"
 

diff --git a/src/controller/BUILD.gn b/src/controller/BUILD.gn
@@ -51,6 +51,8 @@ static_library("controller") {
       "EmptyDataModelHandler.cpp",
       "ExampleOperationalCredentialsIssuer.cpp",
       "ExampleOperationalCredentialsIssuer.h",
+      "ExamplePersistentStorage.cpp",
+      "ExamplePersistentStorage.h",
       "SetUpCodePairer.cpp",
       "SetUpCodePairer.h",
     ]

diff --git a/...es/chip-tool/config/PersistentStorage.cpp → src/controller/ExamplePersistentStorage.cpp b/...es/chip-tool/config/PersistentStorage.cpp → src/controller/ExamplePersistentStorage.cpp
@@ -15,7 +15,7 @@
  *   limitations under the License.
  *
  */
-#include "PersistentStorage.h"
+#include "ExamplePersistentStorage.h"
 
 #include <lib/core/CHIPEncoding.h>
 #include <lib/support/IniEscaping.h>

diff --git a/...ples/chip-tool/config/PersistentStorage.h → src/controller/ExamplePersistentStorage.h b/...ples/chip-tool/config/PersistentStorage.h → src/controller/ExamplePersistentStorage.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ @@
      *
      */
-    #include "../../config/PersistentStorage.h"
+    #include <controller/ExamplePersistentStorage.h>
     #include "StorageManagementCommand.h"
@@ Expand Down @@