Skip to content

Commit 8ed566c

Browse files
authored
[fabric-admin] Remove unused dependency (#33538)
* [fabric-admin] Remove unused dependency * Address review comments
1 parent d311644 commit 8ed566c

13 files changed

+30
-36
lines changed

examples/fabric-admin/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ static_library("fabric-admin-utils") {
6969

7070
sources += [ "commands/interactive/InteractiveCommands.cpp" ]
7171
deps += [
72-
"${chip_root}/examples/common/websocket-server",
7372
"${chip_root}/src/platform/logging:headers",
7473
"${editline_root}:editline",
7574
]

examples/fabric-admin/commands/clusters/JsonParser.h

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

1919
#pragma once
2020

21-
#include "../common/CustomStringPrefix.h"
21+
#include <commands/common/CustomStringPrefix.h>
2222

2323
#include <json/json.h>
2424
#include <lib/core/Optional.h>

examples/fabric-admin/commands/clusters/ModelCommand.h

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

2121
#ifdef CONFIG_USE_LOCAL_STORAGE
2222
#include <controller/ExamplePersistentStorage.h>
23-
#endif // CONFIG_USE_LOCAL_STORAGE
23+
#endif
2424

2525
#include "../common/CHIPCommand.h"
2626
#include <lib/core/CHIPEncoding.h>

examples/fabric-admin/commands/interactive/Commands.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
#pragma once
2020

21-
#include "commands/common/CHIPCommand.h"
22-
#include "commands/common/Commands.h"
23-
#include "commands/interactive/InteractiveCommands.h"
21+
#include <commands/common/CHIPCommand.h>
22+
#include <commands/common/Commands.h>
23+
#include <commands/interactive/InteractiveCommands.h>
2424

2525
void registerCommandsInteractive(Commands & commands, CredentialIssuerCommands * credsIssuerConfig)
2626
{

examples/fabric-admin/commands/interactive/InteractiveCommands.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@
1818

1919
#pragma once
2020

21-
#include "../clusters/DataModelLogger.h"
22-
#include "../common/CHIPCommand.h"
23-
#include "../common/Commands.h"
24-
25-
#include <websocket-server/WebSocketServer.h>
21+
#include <commands/clusters/DataModelLogger.h>
22+
#include <commands/common/CHIPCommand.h>
23+
#include <commands/common/Commands.h>
2624

2725
#include <string>
2826

examples/fabric-admin/commands/pairing/Commands.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
#pragma once
2020

21-
#include "commands/common/Commands.h"
22-
#include "commands/pairing/GetCommissionerNodeIdCommand.h"
23-
#include "commands/pairing/GetCommissionerRootCertificateCommand.h"
24-
#include "commands/pairing/IssueNOCChainCommand.h"
25-
#include "commands/pairing/OpenCommissioningWindowCommand.h"
26-
#include "commands/pairing/PairingCommand.h"
21+
#include <commands/common/Commands.h>
22+
#include <commands/common/CredentialIssuerCommands.h>
23+
#include <commands/pairing/GetCommissionerNodeIdCommand.h>
24+
#include <commands/pairing/GetCommissionerRootCertificateCommand.h>
25+
#include <commands/pairing/IssueNOCChainCommand.h>
26+
#include <commands/pairing/OpenCommissioningWindowCommand.h>
27+
#include <commands/pairing/PairingCommand.h>
2728

2829
#include <app/server/Dnssd.h>
29-
#include <commands/common/CredentialIssuerCommands.h>
3030
#include <lib/dnssd/Resolver.h>
3131

3232
class Unpair : public PairingCommand

examples/fabric-admin/commands/pairing/GetCommissionerNodeIdCommand.h

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

1919
#pragma once
2020

21-
#include "../common/CHIPCommand.h"
22-
#include "../common/RemoteDataModelLogger.h"
21+
#include <commands/common/CHIPCommand.h>
22+
#include <commands/common/RemoteDataModelLogger.h>
2323

2424
class GetCommissionerNodeIdCommand : public CHIPCommand
2525
{

examples/fabric-admin/commands/pairing/GetCommissionerRootCertificateCommand.h

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

1919
#pragma once
2020

21-
#include "../common/CHIPCommand.h"
22-
#include "../common/RemoteDataModelLogger.h"
21+
#include <commands/common/CHIPCommand.h>
22+
#include <commands/common/RemoteDataModelLogger.h>
2323

2424
#include "ToTLVCert.h"
2525

examples/fabric-admin/commands/pairing/IssueNOCChainCommand.h

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

1919
#pragma once
2020

21-
#include "../common/CHIPCommand.h"
22-
#include "../common/RemoteDataModelLogger.h"
21+
#include <commands/common/CHIPCommand.h>
22+
#include <commands/common/RemoteDataModelLogger.h>
2323

2424
#include "ToTLVCert.h"
2525

examples/fabric-admin/commands/pairing/OpenCommissioningWindowCommand.h

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

1919
#pragma once
2020

21-
#include "../common/CHIPCommand.h"
22-
21+
#include <commands/common/CHIPCommand.h>
2322
#include <controller/CommissioningWindowOpener.h>
2423
#include <lib/support/CHIPMem.h>
2524

examples/fabric-admin/commands/pairing/PairingCommand.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
*/
1818

1919
#include "PairingCommand.h"
20-
#include "platform/PlatformManager.h"
20+
2121
#include <commands/common/DeviceScanner.h>
2222
#include <controller/ExampleOperationalCredentialsIssuer.h>
2323
#include <crypto/CHIPCryptoPAL.h>
2424
#include <lib/core/CHIPSafeCasts.h>
2525
#include <lib/support/logging/CHIPLogging.h>
26+
#include <platform/PlatformManager.h>
2627
#include <protocols/secure_channel/PASESession.h>
27-
2828
#include <setup_payload/ManualSetupPayloadParser.h>
2929
#include <setup_payload/QRCodeSetupPayloadParser.h>
3030

examples/fabric-admin/commands/pairing/PairingCommand.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@
1818

1919
#pragma once
2020

21-
#include "../common/CHIPCommand.h"
21+
#include <commands/common/CHIPCommand.h>
22+
#include <commands/common/CredentialIssuerCommands.h>
2223
#include <controller/CommissioningDelegate.h>
2324
#include <controller/CurrentFabricRemover.h>
24-
25-
#include <commands/common/CredentialIssuerCommands.h>
2625
#include <lib/support/Span.h>
2726
#include <lib/support/ThreadOperationalDataset.h>
2827

examples/fabric-admin/main.cpp

+4-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
*
1717
*/
1818

19-
#include "commands/common/Commands.h"
20-
21-
#include "commands/clusters/SubscriptionsCommands.h"
22-
#include "commands/interactive/Commands.h"
23-
#include "commands/pairing/Commands.h"
19+
#include <commands/clusters/SubscriptionsCommands.h>
20+
#include <commands/common/Commands.h>
21+
#include <commands/interactive/Commands.h>
22+
#include <commands/pairing/Commands.h>
2423
#include <zap-generated/cluster/Commands.h>
2524

2625
#include <iostream>

0 commit comments

Comments
 (0)