Skip to content

Commit 73cc4f1

Browse files
andy31415andreilitvin
andy31415
and
andreilitvin
authored
Move src/app/codegen-data-model-provider to src/data-model-providers/codegen (project-chip#36752)
* Move codegen provider to data-model-providers/codegen to not place it within app directly * Restyle * Fix paths with minimal change --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com>
1 parent 5979900 commit 73cc4f1

File tree

121 files changed

+137
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+137
-135
lines changed

‎.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ jobs:
292292
git grep -I -n 'emberAfWriteAttribute' -- './*' \
293293
':(exclude).github/workflows/lint.yml' \
294294
':(exclude)examples/common/pigweed/rpc_services/Attributes.h' \
295-
':(exclude)src/app/codegen-data-model-provider/CodegenDataModelProvider_Write.cpp' \
296-
':(exclude)src/app/codegen-data-model-provider/tests/EmberReadWriteOverride.cpp' \
295+
':(exclude)src/data-model-providers/codegen/CodegenDataModelProvider_Write.cpp' \
296+
':(exclude)src/data-model-providers/codegen/tests/EmberReadWriteOverride.cpp' \
297297
':(exclude)src/app/dynamic_server/DynamicDispatcher.cpp' \
298298
':(exclude)src/app/util/attribute-table.cpp' \
299299
':(exclude)src/app/util/attribute-table.h' \

‎examples/air-purifier-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <air-purifier-manager.h>
3131
#include <app/clusters/identify-server/identify-server.h>
3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33-
#include <app/codegen-data-model-provider/Instance.h>
3433
#include <app/server/OnboardingCodesUtil.h>
3534
#include <app/util/endpoint-config-api.h>
35+
#include <data-model-providers/codegen/Instance.h>
3636
#include <lib/core/ErrorStr.h>
3737
#include <platform/Ameba/AmebaConfig.h>
3838
#include <platform/Ameba/NetworkCommissioningDriver.h>

‎examples/air-purifier-app/cc32xx/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
#include <lib/support/CHIPPlatformMemory.h>
3939
#include <platform/CHIPDeviceLayer.h>
4040

41-
#include <app/codegen-data-model-provider/Instance.h>
4241
#include <app/server/Dnssd.h>
4342
#include <app/server/OnboardingCodesUtil.h>
43+
#include <data-model-providers/codegen/Instance.h>
4444

4545
#include <ti/drivers/apps/Button.h>
4646
#include <ti/drivers/apps/LED.h>

‎examples/all-clusters-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
#include <app/clusters/identify-server/identify-server.h>
3333
#include <app/clusters/network-commissioning/network-commissioning.h>
34-
#include <app/codegen-data-model-provider/Instance.h>
3534
#include <app/server/OnboardingCodesUtil.h>
3635
#include <app/server/Server.h>
3736
#include <app/util/endpoint-config-api.h>
37+
#include <data-model-providers/codegen/Instance.h>
3838
#include <lib/core/ErrorStr.h>
3939

4040
#include <platform/Ameba/AmebaConfig.h>

‎examples/all-clusters-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "LEDWidget.h"
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
28-
#include <app/codegen-data-model-provider/Instance.h>
2928
#include <app/server/Dnssd.h>
3029
#include <app/server/OnboardingCodesUtil.h>
3130
#include <app/server/Server.h>
@@ -35,6 +34,7 @@
3534
#include <credentials/DeviceAttestationCredsProvider.h>
3635
#include <credentials/examples/DeviceAttestationCredsExample.h>
3736
#include <cy_wcm.h>
37+
#include <data-model-providers/codegen/Instance.h>
3838
#include <platform/CHIPDeviceLayer.h>
3939
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4040
#include <setup_payload/SetupPayload.h>

‎examples/all-clusters-app/linux/fuzzing-main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717

1818
#include "AppMain.h"
19-
#include <app/codegen-data-model-provider/Instance.h>
2019
#include <app/server/Server.h>
20+
#include <data-model-providers/codegen/Instance.h>
2121

2222
#include <CommissionableInit.h>
2323

‎examples/all-clusters-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <app/TestEventTriggerDelegate.h>
3131
#include <app/clusters/identify-server/identify-server.h>
3232
#include <app/clusters/ota-requestor/OTATestEventTriggerHandler.h>
33-
#include <app/codegen-data-model-provider/Instance.h>
3433
#include <app/util/attribute-storage.h>
3534
#include <app/util/endpoint-config-api.h>
35+
#include <data-model-providers/codegen/Instance.h>
3636

3737
#include <credentials/DeviceAttestationCredsProvider.h>
3838
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/all-clusters-app/nxp/mw320/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
#include <app-common/zap-generated/attributes/Accessors.h>
3333
#include <app-common/zap-generated/ids/Attributes.h>
3434
#include <app-common/zap-generated/ids/Clusters.h>
35-
#include <app/codegen-data-model-provider/Instance.h>
3635
#include <app/server/Dnssd.h>
3736
#include <app/server/Server.h>
3837
#include <app/util/af-types.h>
3938
#include <app/util/attribute-storage.h>
4039
#include <app/util/attribute-table.h>
40+
#include <data-model-providers/codegen/Instance.h>
4141
#include <lib/support/CHIPMem.h>
4242
#include <lib/support/logging/CHIPLogging.h>
4343
#include <platform/CHIPDeviceLayer.h>

‎examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828
#include <app/clusters/identify-server/identify-server.h>
2929
#include <app/clusters/network-commissioning/network-commissioning.h>
30-
#include <app/codegen-data-model-provider/Instance.h>
3130
#include <app/server/OnboardingCodesUtil.h>
3231
#include <app/server/Server.h>
3332
#include <app/util/endpoint-config-api.h>
3433
#include <credentials/DeviceAttestationCredsProvider.h>
3534
#include <credentials/examples/DeviceAttestationCredsExample.h>
35+
#include <data-model-providers/codegen/Instance.h>
3636
#include <lib/core/ErrorStr.h>
3737
#include <platform/Ameba/AmebaConfig.h>
3838
#include <platform/Ameba/NetworkCommissioningDriver.h>

‎examples/all-clusters-minimal-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "LEDWidget.h"
2626
#include <app-common/zap-generated/attributes/Accessors.h>
2727
#include <app-common/zap-generated/ids/Clusters.h>
28-
#include <app/codegen-data-model-provider/Instance.h>
2928
#include <app/server/Dnssd.h>
3029
#include <app/server/OnboardingCodesUtil.h>
3130
#include <app/server/Server.h>
@@ -35,6 +34,7 @@
3534
#include <credentials/DeviceAttestationCredsProvider.h>
3635
#include <credentials/examples/DeviceAttestationCredsExample.h>
3736
#include <cy_wcm.h>
37+
#include <data-model-providers/codegen/Instance.h>
3838
#include <platform/CHIPDeviceLayer.h>
3939
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4040
#include <setup_payload/SetupPayload.h>

‎examples/all-clusters-minimal-app/linux/fuzzing-main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717

1818
#include "AppMain.h"
19-
#include <app/codegen-data-model-provider/Instance.h>
2019
#include <app/server/Server.h>
20+
#include <data-model-providers/codegen/Instance.h>
2121

2222
using namespace chip;
2323
using namespace chip::DeviceLayer;

‎examples/all-clusters-minimal-app/mbed/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
#include "LEDWidget.h"
2121
#include <DFUManager.h>
2222

23-
#include <app/codegen-data-model-provider/Instance.h>
2423
#include <app/server/Dnssd.h>
2524
#include <app/server/OnboardingCodesUtil.h>
2625
#include <app/server/Server.h>
2726
#include <credentials/DeviceAttestationCredsProvider.h>
2827
#include <credentials/examples/DeviceAttestationCredsExample.h>
28+
#include <data-model-providers/codegen/Instance.h>
2929

3030
#include <lib/support/logging/CHIPLogging.h>
3131
#include <static-supported-modes-manager.h>

‎examples/all-clusters-minimal-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#include "LEDUtil.h"
2323
#include "binding-handler.h"
2424

25-
#include <app/codegen-data-model-provider/Instance.h>
2625
#include <app/server/OnboardingCodesUtil.h>
2726
#include <app/server/Server.h>
27+
#include <data-model-providers/codegen/Instance.h>
2828

2929
#include <app/util/attribute-storage.h>
3030
#include <app/util/endpoint-config-api.h>

‎examples/chef/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929
#include <app/clusters/identify-server/identify-server.h>
3030
#include <app/clusters/network-commissioning/network-commissioning.h>
31-
#include <app/codegen-data-model-provider/Instance.h>
3231
#include <app/server/OnboardingCodesUtil.h>
3332
#include <app/server/Server.h>
3433
#include <app/util/endpoint-config-api.h>
3534
#include <credentials/DeviceAttestationCredsProvider.h>
3635
#include <credentials/examples/DeviceAttestationCredsExample.h>
36+
#include <data-model-providers/codegen/Instance.h>
3737
#include <lib/core/ErrorStr.h>
3838
#include <platform/Ameba/AmebaConfig.h>
3939
#include <platform/Ameba/FactoryDataProvider.h>

‎examples/chef/esp32/main/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
#include <app/clusters/network-commissioning/network-commissioning.h>
33-
#include <app/codegen-data-model-provider/Instance.h>
3433
#include <app/server/OnboardingCodesUtil.h>
3534
#include <app/server/Server.h>
35+
#include <data-model-providers/codegen/Instance.h>
3636

3737
#include <credentials/DeviceAttestationCredsProvider.h>
3838
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/chef/nrfconnect/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include <lib/support/CHIPMem.h>
2626
#include <platform/CHIPDeviceLayer.h>
2727

28-
#include <app/codegen-data-model-provider/Instance.h>
2928
#include <app/server/OnboardingCodesUtil.h>
3029
#include <app/server/Server.h>
30+
#include <data-model-providers/codegen/Instance.h>
3131

3232
#include <credentials/DeviceAttestationCredsProvider.h>
3333
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/chip-tool/commands/common/CHIPCommand.cpp

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

1919
#include "CHIPCommand.h"
2020

21-
#include <app/codegen-data-model-provider/Instance.h>
2221
#include <commands/icd/ICDCommand.h>
2322
#include <controller/CHIPDeviceControllerFactory.h>
2423
#include <credentials/attestation_verifier/FileAttestationTrustStore.h>
2524
#include <credentials/attestation_verifier/TestDACRevocationDelegateImpl.h>
25+
#include <data-model-providers/codegen/Instance.h>
2626
#include <lib/core/CHIPConfig.h>
2727
#include <lib/core/CHIPVendorIdentifiers.hpp>
2828
#include <lib/support/CodeUtils.h>

‎examples/contact-sensor-app/nxp/k32w0/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
*/
1919
#include "AppTask.h"
2020
#include "AppEvent.h"
21-
#include <app/codegen-data-model-provider/Instance.h>
2221
#include <app/server/OnboardingCodesUtil.h>
2322
#include <app/server/Server.h>
23+
#include <data-model-providers/codegen/Instance.h>
2424
#include <lib/core/ErrorStr.h>
2525

2626
#include <DeviceInfoProviderImpl.h>

‎examples/fabric-admin/commands/common/CHIPCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
#include "IcdManager.h"
2222

23-
#include <app/codegen-data-model-provider/Instance.h>
2423
#include <controller/CHIPDeviceControllerFactory.h>
2524
#include <credentials/attestation_verifier/FileAttestationTrustStore.h>
25+
#include <data-model-providers/codegen/Instance.h>
2626
#include <device_manager/PairingManager.h>
2727
#include <lib/core/CHIPConfig.h>
2828
#include <lib/core/CHIPVendorIdentifiers.hpp>

‎examples/light-switch-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/clusters/network-commissioning/network-commissioning.h>
32-
#include <app/codegen-data-model-provider/Instance.h>
3332
#include <app/server/OnboardingCodesUtil.h>
3433
#include <app/server/Server.h>
3534
#include <app/util/endpoint-config-api.h>
35+
#include <data-model-providers/codegen/Instance.h>
3636
#include <lib/core/ErrorStr.h>
3737
#include <platform/Ameba/AmebaConfig.h>
3838
#include <platform/Ameba/NetworkCommissioningDriver.h>

‎examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
#include "FreeRTOS.h"
2626

27-
#include <app/codegen-data-model-provider/Instance.h>
2827
#include <credentials/DeviceAttestationCredsProvider.h>
2928
#include <credentials/examples/DeviceAttestationCredsExample.h>
29+
#include <data-model-providers/codegen/Instance.h>
3030
#include <examples/platform/cc13x4_26x4/CC13X4_26X4DeviceAttestationCreds.h>
3131

3232
#include <DeviceInfoProviderImpl.h>

‎examples/light-switch-app/genio/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
#include <app/clusters/identify-server/identify-server.h>
2929
#include <app/clusters/network-commissioning/network-commissioning.h>
30-
#include <app/codegen-data-model-provider/Instance.h>
3130
#include <app/server/OnboardingCodesUtil.h>
3231
#include <app/server/Server.h>
3332
#include <app/util/attribute-storage.h>
33+
#include <data-model-providers/codegen/Instance.h>
3434

3535
#include <assert.h>
3636

‎examples/light-switch-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
#include <app/TestEventTriggerDelegate.h>
2828
#include <app/clusters/identify-server/identify-server.h>
2929
#include <app/clusters/ota-requestor/OTATestEventTriggerHandler.h>
30-
#include <app/codegen-data-model-provider/Instance.h>
3130
#include <app/server/OnboardingCodesUtil.h>
3231
#include <app/server/Server.h>
3332
#include <credentials/DeviceAttestationCredsProvider.h>
3433
#include <credentials/examples/DeviceAttestationCredsExample.h>
34+
#include <data-model-providers/codegen/Instance.h>
3535
#include <lib/support/CHIPMem.h>
3636
#include <lib/support/CodeUtils.h>
3737
#include <lib/support/SafeInt.h>

‎examples/light-switch-app/qpg/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ using namespace ::chip;
3535
#include <app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerHandler.h>
3636
#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
3737
#include <app/clusters/identify-server/identify-server.h>
38-
#include <app/codegen-data-model-provider/Instance.h>
3938
#include <app/server/Dnssd.h>
4039
#include <app/server/Server.h>
4140
#include <app/util/attribute-storage.h>
41+
#include <data-model-providers/codegen/Instance.h>
4242

4343
#include <credentials/DeviceAttestationCredsProvider.h>
4444
#include <credentials/examples/DeviceAttestationCredsExample.h>

‎examples/lighting-app/ameba/main/chipinterface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131

3232
#include <app/clusters/identify-server/identify-server.h>
3333
#include <app/clusters/network-commissioning/network-commissioning.h>
34-
#include <app/codegen-data-model-provider/Instance.h>
3534
#include <app/server/OnboardingCodesUtil.h>
3635
#include <app/util/endpoint-config-api.h>
36+
#include <data-model-providers/codegen/Instance.h>
3737
#include <lib/core/ErrorStr.h>
3838
#include <platform/Ameba/AmebaConfig.h>
3939
#include <platform/Ameba/NetworkCommissioningDriver.h>

‎examples/lighting-app/cc13x4_26x4/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

4545
#include <app/clusters/identify-server/identify-server.h>
4646
#include <app/clusters/on-off-server/on-off-server.h>
47-
#include <app/codegen-data-model-provider/Instance.h>
4847
#include <app/server/OnboardingCodesUtil.h>
4948
#include <app/server/Server.h>
5049
#include <app/util/attribute-storage.h>
50+
#include <data-model-providers/codegen/Instance.h>
5151

5252
#include <app/TestEventTriggerDelegate.h>
5353
#include <app/clusters/general-diagnostics-server/GenericFaultTestEventTriggerHandler.h>

‎examples/lighting-app/genio/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
#include <app/clusters/identify-server/identify-server.h>
3030
#include <app/clusters/network-commissioning/network-commissioning.h>
3131
#include <app/clusters/on-off-server/on-off-server.h>
32-
#include <app/codegen-data-model-provider/Instance.h>
3332
#include <app/server/OnboardingCodesUtil.h>
3433
#include <app/server/Server.h>
3534
#include <app/util/attribute-storage.h>
35+
#include <data-model-providers/codegen/Instance.h>
3636

3737
#include <assert.h>
3838

‎examples/lighting-app/infineon/psoc6/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include <DeviceInfoProviderImpl.h>
4141
#include <app/clusters/identify-server/identify-server.h>
4242
#include <app/clusters/network-commissioning/network-commissioning.h>
43-
#include <app/codegen-data-model-provider/Instance.h>
43+
#include <data-model-providers/codegen/Instance.h>
4444
#include <platform/Infineon/PSOC6/NetworkCommissioningDriver.h>
4545

4646
/* OTA related includes */

‎examples/lighting-app/mbed/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
#include "LEDWidget.h"
2121
#include "LightingManager.h"
2222

23-
#include <app/codegen-data-model-provider/Instance.h>
2423
#include <app/server/Dnssd.h>
2524
#include <app/server/OnboardingCodesUtil.h>
2625
#include <app/server/Server.h>
2726
#include <credentials/DeviceAttestationCredsProvider.h>
2827
#include <credentials/examples/DeviceAttestationCredsExample.h>
28+
#include <data-model-providers/codegen/Instance.h>
2929
#include <lib/support/logging/CHIPLogging.h>
3030
#include <platform/CHIPDeviceLayer.h>
3131

‎examples/lighting-app/nrfconnect/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
#include <app/TestEventTriggerDelegate.h>
3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/clusters/ota-requestor/OTATestEventTriggerHandler.h>
32-
#include <app/codegen-data-model-provider/Instance.h>
3332
#include <app/server/Dnssd.h>
3433
#include <app/server/OnboardingCodesUtil.h>
3534
#include <app/server/Server.h>
3635
#include <app/util/persistence/DefaultAttributePersistenceProvider.h>
3736
#include <app/util/persistence/DeferredAttributePersistenceProvider.h>
3837
#include <credentials/DeviceAttestationCredsProvider.h>
3938
#include <credentials/examples/DeviceAttestationCredsExample.h>
39+
#include <data-model-providers/codegen/Instance.h>
4040
#include <lib/core/ErrorStr.h>
4141
#include <lib/support/CHIPMem.h>
4242
#include <lib/support/CodeUtils.h>

‎examples/lighting-app/nxp/k32w0/main/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
#include <app/server/Server.h>
2323
#include <lib/core/ErrorStr.h>
2424

25-
#include <app/codegen-data-model-provider/Instance.h>
2625
#include <app/server/OnboardingCodesUtil.h>
2726
#include <credentials/DeviceAttestationCredsProvider.h>
2827
#include <credentials/examples/DeviceAttestationCredsExample.h>
28+
#include <data-model-providers/codegen/Instance.h>
2929
#include <inet/EndPointStateOpenThread.h>
3030
#include <lib/support/ThreadOperationalDataset.h>
3131
#include <platform/CHIPDeviceLayer.h>

‎examples/lighting-app/qpg/src/AppTask.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
#include <app/clusters/general-diagnostics-server/general-diagnostics-server.h>
3636
#include <app/clusters/identify-server/identify-server.h>
3737
#include <app/clusters/on-off-server/on-off-server.h>
38-
#include <app/codegen-data-model-provider/Instance.h>
3938
#include <app/server/OnboardingCodesUtil.h>
4039
#include <app/util/persistence/DefaultAttributePersistenceProvider.h>
40+
#include <data-model-providers/codegen/Instance.h>
4141
#include <lib/core/CHIPError.h>
4242
#include <lib/core/CHIPPersistentStorageDelegate.h>
4343

0 commit comments

Comments
 (0)