Skip to content

Commit 5727ff0

Browse files
authored
Split out AttributeAccessInterface.h into separate headers/cpp for each underlying class (project-chip#32984)
* Switch out AttributeReportBuilder * Restyle * Moved things around * Split out the decoder as well * Fix lists to be working * Restyle * Fix up some headers * Fix includes * Fix copyrights * Fix another include * Restyle
1 parent 2f6d910 commit 5727ff0

File tree

64 files changed

+542
-554
lines changed

Some content is hidden

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

64 files changed

+542
-554
lines changed

examples/chef/common/clusters/media-input/MediaInputManager.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
21+
#include <app/AttributeValueEncoder.h>
2222
#include <app/clusters/media-input-server/media-input-server.h>
2323

2424
#include <string>

examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp

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

2121
#include "../logging/Log.h"
2222

23-
#include <app/AttributeAccessInterface.h>
2423
#include <app/MessageDef/InvokeRequestMessage.h>
2524
#include <app/MessageDef/InvokeResponseMessage.h>
2625
#include <app/MessageDef/ReportDataMessage.h>

examples/tv-app/android/include/cluster-init.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <app-common/zap-generated/cluster-objects.h>
2525
#include <app-common/zap-generated/ids/Attributes.h>
2626
#include <app-common/zap-generated/ids/Clusters.h>
27-
#include <app/AttributeAccessInterface.h>
2827
#include <app/util/attribute-storage.h>
2928

3029
using namespace chip;

examples/tv-app/android/include/content-app-observer/ContentAppObserver.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
2221
#include <app/clusters/content-app-observer/content-app-observer.h>
23-
#include <vector>
2422

2523
using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
2624
using ContentAppMessageResponse = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;

examples/tv-app/android/include/content-control/ContentController.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
21+
#include <app/AttributeValueEncoder.h>
2222
#include <app/clusters/content-control-server/content-control-server.h>
23-
#include <vector>
2423

2524
using ContentControlDelegate = chip::app::Clusters::ContentControl::Delegate;
2625
using ResetPINResponseType = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Type;

examples/tv-app/android/java/ContentAppAttributeDelegate.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
#include "ContentAppAttributeDelegate.h"
2424
#include <app-common/zap-generated/cluster-objects.h>
25-
#include <app/AttributeAccessInterface.h>
2625
#include <app/util/config.h>
2726
#include <jni.h>
2827
#include <lib/support/CHIPJNIError.h>

examples/tv-app/android/java/ContentAppAttributeDelegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#pragma once
2424

2525
#include <app-common/zap-generated/ids/Clusters.h>
26-
#include <app/AttributeAccessInterface.h>
26+
#include <app/ConcreteAttributePath.h>
2727
#include <jni.h>
2828
#include <lib/core/DataModelTypes.h>
2929
#include <lib/support/JniReferences.h>

examples/tv-app/android/java/ContentLauncherManager.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
#include <lib/support/JniReferences.h>
2828
#include <lib/support/JniTypeWrappers.h>
2929

30-
#include <string>
31-
3230
using namespace std;
3331
using namespace chip;
3432
using namespace chip::app::DataModel;

examples/tv-app/android/java/ContentLauncherManager.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
21+
#include <app/AttributeValueEncoder.h>
2222
#include <app/clusters/content-launch-server/content-launch-server.h>
2323
#include <jni.h>
2424
#include <lib/core/CHIPError.h>

examples/tv-app/android/java/MediaInputManager.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
21+
#include <app/AttributeValueEncoder.h>
2222
#include <app/clusters/media-input-server/media-input-server.h>
2323
#include <jni.h>
2424
#include <lib/support/JniReferences.h>

examples/tv-app/tv-common/clusters/content-app-observer/ContentAppObserver.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
2221
#include <app/clusters/content-app-observer/content-app-observer.h>
23-
#include <vector>
2422

2523
using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
2624
using ContentAppMessageResponse = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;
@@ -32,6 +30,4 @@ class ContentAppObserverManager : public ContentAppObserverDelegate
3230

3331
void HandleContentAppMessage(chip::app::CommandResponseHelper<ContentAppMessageResponse> & helper,
3432
const chip::Optional<chip::CharSpan> & data, const chip::CharSpan & encodingHint) override;
35-
36-
protected:
3733
};

examples/tv-app/tv-common/clusters/content-control/ContentController.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
21+
#include <app/AttributeValueEncoder.h>
2222
#include <app/clusters/content-control-server/content-control-server.h>
23-
#include <vector>
2423

2524
using ContentControlDelegate = chip::app::Clusters::ContentControl::Delegate;
2625
using ResetPINResponseType = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Type;

examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/*
2-
*
32
* Copyright (c) 2021 Project CHIP Authors
43
* All rights reserved.
54
*
@@ -15,10 +14,11 @@
1514
* See the License for the specific language governing permissions and
1615
* limitations under the License.
1716
*/
18-
1917
#pragma once
2018

2119
#include <app/clusters/content-launch-server/content-launch-server.h>
20+
21+
#include <list>
2222
#include <string>
2323
#include <vector>
2424

examples/tv-app/tv-common/clusters/media-input/MediaInputManager.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
21+
#include <app/AttributeValueEncoder.h>
2222
#include <app/clusters/media-input-server/media-input-server.h>
2323
#include <vector>
2424

examples/tv-casting-app/tv-casting-common/clusters/content-app-observer/ContentAppObserver.h

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

1919
#pragma once
2020

21-
#include <app/AttributeAccessInterface.h>
2221
#include <app/clusters/content-app-observer/content-app-observer.h>
23-
#include <vector>
2422

2523
using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
2624
using ContentAppMessageResponse = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;

0 commit comments

Comments
 (0)