Skip to content

Commit f05f3f0

Browse files
authored
move att-storage.h to src/app/util and make it known to GN (project-chip#32435)
* Move att-storage to be placed in util * Restyle * remove att storage from gn linter
1 parent 4b0cbcc commit f05f3f0

File tree

21 files changed

+19
-19
lines changed

21 files changed

+19
-19
lines changed

.github/workflows/lint.yml

-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ jobs:
9292
--known-failure controller/ExamplePersistentStorage.h \
9393
--known-failure app/AttributeAccessInterface.h \
9494
--known-failure app/AttributeAccessToken.h \
95-
--known-failure app/att-storage.h \
9695
--known-failure app/CommandHandler.h \
9796
--known-failure app/CommandHandlerInterface.h \
9897
--known-failure app/CommandSenderLegacyCallback.h \

examples/air-quality-sensor-app/linux/AirQualitySensorAppAttrUpdateDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#include "AirQualitySensorAppAttrUpdateDelegate.h"
2020

2121
#include <app-common/zap-generated/attributes/Accessors.h>
22-
#include <app/att-storage.h>
2322
#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
2423
#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
2524
#include <app/clusters/switch-server/switch-server.h>
2625
#include <app/server/Server.h>
26+
#include <app/util/att-storage.h>
2727
#include <platform/PlatformManager.h>
2828

2929
#include <air-quality-sensor-manager.h>

examples/all-clusters-app/linux/AllClustersCommandDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#include "AllClustersCommandDelegate.h"
2020

2121
#include <app-common/zap-generated/attributes/Accessors.h>
22-
#include <app/att-storage.h>
2322
#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
2423
#include <app/clusters/smoke-co-alarm-server/smoke-co-alarm-server.h>
2524
#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
2625
#include <app/clusters/switch-server/switch-server.h>
2726
#include <app/server/Server.h>
27+
#include <app/util/att-storage.h>
2828
#include <platform/PlatformManager.h>
2929

3030
#include <air-quality-instance.h>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#include <Options.h>
4141
#include <app-common/zap-generated/attributes/Accessors.h>
4242
#include <app/CommandHandler.h>
43-
#include <app/att-storage.h>
4443
#include <app/clusters/diagnostic-logs-server/diagnostic-logs-server.h>
4544
#include <app/clusters/identify-server/identify-server.h>
4645
#include <app/clusters/laundry-dryer-controls-server/laundry-dryer-controls-server.h>
@@ -50,6 +49,7 @@
5049
#include <app/clusters/valve-configuration-and-control-server/valve-configuration-and-control-server.h>
5150
#include <app/server/Server.h>
5251
#include <app/util/af.h>
52+
#include <app/util/att-storage.h>
5353
#include <app/util/attribute-storage.h>
5454
#include <lib/support/CHIPMem.h>
5555
#include <new>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
#include "include/tv-callbacks.h"
2020
#include <app-common/zap-generated/attributes/Accessors.h>
2121
#include <app/CommandHandler.h>
22-
#include <app/att-storage.h>
2322
#include <app/clusters/identify-server/identify-server.h>
2423
#include <app/server/Server.h>
2524
#include <app/util/af.h>
25+
#include <app/util/att-storage.h>
2626
#include <lib/support/CHIPMem.h>
2727
#include <new>
2828
#include <platform/PlatformManager.h>

examples/chef/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040

4141
#include <app-common/zap-generated/callback.h>
4242
#include <app-common/zap-generated/cluster-objects.h>
43-
#include <app/att-storage.h>
4443
#include <app/server/Dnssd.h>
4544
#include <app/util/af.h>
45+
#include <app/util/att-storage.h>
4646
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4747

4848
#include "Display.h"

examples/lighting-app/infineon/cyw30739/src/LightingManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
#include "LightingManager.h"
2121
#include <app-common/zap-generated/attributes/Accessors.h>
22-
#include <app/att-storage.h>
2322
#include <app/util/af.h>
23+
#include <app/util/att-storage.h>
2424
#include <stdio.h>
2525

2626
using namespace chip;

examples/lighting-app/linux/LightingAppCommandDelegate.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#include "LightingAppCommandDelegate.h"
2020

2121
#include <app-common/zap-generated/attributes/Accessors.h>
22-
#include <app/att-storage.h>
2322
#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
2423
#include <app/clusters/software-diagnostics-server/software-diagnostics-server.h>
2524
#include <app/clusters/switch-server/switch-server.h>
2625
#include <app/server/Server.h>
26+
#include <app/util/att-storage.h>
2727
#include <platform/PlatformManager.h>
2828

2929
using namespace chip;

src/app/AttributePathExpandIterator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <app/ConcreteAttributePath.h>
2323
#include <app/EventManagement.h>
2424
#include <app/GlobalAttributes.h>
25-
#include <app/att-storage.h>
25+
#include <app/util/att-storage.h>
2626
#include <lib/core/CHIPCore.h>
2727
#include <lib/core/TLVDebug.h>
2828
#include <lib/support/CodeUtils.h>

src/app/clusters/group-key-mgmt-server/group-key-mgmt-server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include <app/AttributeAccessInterface.h>
2121
#include <app/CommandHandler.h>
2222
#include <app/MessageDef/StatusIB.h>
23-
#include <app/att-storage.h>
2423
#include <app/server/Server.h>
2524
#include <app/util/af.h>
25+
#include <app/util/att-storage.h>
2626
#include <app/util/attribute-storage.h>
2727
#include <credentials/GroupDataProvider.h>
2828
#include <lib/support/CodeUtils.h>

src/app/clusters/groups-server/groups-server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
#include <app-common/zap-generated/cluster-objects.h>
2222
#include <app-common/zap-generated/ids/Clusters.h>
2323
#include <app/CommandHandler.h>
24-
#include <app/att-storage.h>
2524
#include <app/reporting/reporting.h>
2625
#include <app/util/af.h>
26+
#include <app/util/att-storage.h>
2727
#include <app/util/config.h>
2828
#include <credentials/GroupDataProvider.h>
2929
#include <inttypes.h>

src/app/clusters/mode-select-server/mode-select-server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include <app/AttributeAccessInterface.h>
2323
#include <app/CommandHandler.h>
2424
#include <app/ConcreteCommandPath.h>
25-
#include <app/att-storage.h>
2625
#include <app/clusters/mode-select-server/supported-modes-manager.h>
2726
#include <app/util/af.h>
27+
#include <app/util/att-storage.h>
2828
#include <app/util/attribute-storage.h>
2929
#include <app/util/config.h>
3030
#include <app/util/odd-sized-integers.h>

src/app/dynamic_server/DynamicDispatcher.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include <app/MessageDef/AttributeReportIBs.h>
3131
#include <app/MessageDef/StatusIB.h>
3232
#include <app/WriteHandler.h>
33-
#include <app/att-storage.h>
3433
#include <app/data-model/Decode.h>
34+
#include <app/util/att-storage.h>
3535
#include <app/util/endpoint-config-api.h>
3636
#include <lib/core/CHIPError.h>
3737
#include <lib/core/DataModelTypes.h>

src/app/util/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import("${chip_root}/src/app/common_flags.gni")
1717

1818
source_set("types") {
1919
sources = [
20+
"att-storage.h",
2021
"attribute-metadata.cpp",
2122
"attribute-metadata.h",
2223
"basic-types.h",
File renamed without changes.

src/app/util/attribute-storage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <app/util/endpoint-config-api.h>
2626
#include <lib/support/CodeUtils.h>
2727

28-
#include <app/att-storage.h>
28+
#include <app/util/att-storage.h>
2929
#include <zap-generated/endpoint_config.h>
3030

3131
#include <protocols/interaction_model/StatusCode.h>

src/app/util/ember-compatibility-functions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#include <app/GlobalAttributes.h>
2929
#include <app/InteractionModelEngine.h>
3030
#include <app/RequiredPrivilege.h>
31-
#include <app/att-storage.h>
3231
#include <app/reporting/Engine.h>
3332
#include <app/reporting/reporting.h>
3433
#include <app/util/af.h>
34+
#include <app/util/att-storage.h>
3535
#include <app/util/attribute-storage-null-handling.h>
3636
#include <app/util/attribute-storage.h>
3737
#include <app/util/attribute-table.h>

src/app/util/mock/MockNodeConfig.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include <app/util/mock/MockNodeConfig.h>
2020

21-
#include <app/att-storage.h>
2221
#include <app/util/af.h>
22+
#include <app/util/att-storage.h>
2323
#include <lib/support/CodeUtils.h>
2424

2525
#include <utility>

src/app/util/mock/attribute-storage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
#include <app/MessageDef/AttributeDataIB.h>
3434
#include <app/MessageDef/AttributeReportIB.h>
3535
#include <app/MessageDef/AttributeStatusIB.h>
36-
#include <app/att-storage.h>
3736
#include <app/util/af.h>
37+
#include <app/util/att-storage.h>
3838
#include <app/util/mock/Constants.h>
3939
#include <app/util/mock/MockNodeConfig.h>
4040

src/darwin/Framework/CHIP/ServerEndpoint/MTRIMDispatch.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <app-common/zap-generated/cluster-objects.h>
1919
#include <app/CommandHandler.h>
2020
#include <app/ConcreteCommandPath.h>
21-
#include <app/att-storage.h>
21+
#include <app/util/att-storage.h>
2222

2323
#include <app/util/af-types.h>
2424
#include <app/util/privilege-storage.h>

src/darwin/Framework/CHIP/ServerEndpoint/MTRServerEndpoint.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
// TODO: These af-types.h and att-storage.h and attribute-storage.h and
3131
// endpoint-config-api.h and probably CodeUtils.h bits are a hack that should
3232
// eventually go away.
33-
#include <app/att-storage.h>
3433
#include <app/util/af-types.h>
34+
#include <app/util/att-storage.h>
3535
#include <app/util/attribute-storage.h>
3636
#include <app/util/endpoint-config-api.h>
3737
#include <lib/support/CodeUtils.h>

0 commit comments

Comments
 (0)