Split out AttributeAccessInterface.h into separate headers/cpp for …

…each underlying class (#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
project-chip · Apr 15, 2024 · 5727ff0 · 5727ff0
1 parent 2f6d910
commit 5727ff0
Show file tree

Hide file tree

Showing 64 changed files with 542 additions and 554 deletions.
diff --git a/examples/chef/common/clusters/media-input/MediaInputManager.h b/examples/chef/common/clusters/media-input/MediaInputManager.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
+#include <app/AttributeValueEncoder.h>
 #include <app/clusters/media-input-server/media-input-server.h>
 
 #include <string>

diff --git a/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp b/examples/common/tracing/decoder/interaction_model/DecoderCustomLog.cpp
@@ -20,7 +20,6 @@
 
 #include "../logging/Log.h"
 
-#include <app/AttributeAccessInterface.h>
 #include <app/MessageDef/InvokeRequestMessage.h>
 #include <app/MessageDef/InvokeResponseMessage.h>
 #include <app/MessageDef/ReportDataMessage.h>

diff --git a/examples/tv-app/android/include/cluster-init.cpp b/examples/tv-app/android/include/cluster-init.cpp
@@ -24,7 +24,6 @@
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app-common/zap-generated/ids/Attributes.h>
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/AttributeAccessInterface.h>
 #include <app/util/attribute-storage.h>
 
 using namespace chip;

diff --git a/examples/tv-app/android/include/content-app-observer/ContentAppObserver.h b/examples/tv-app/android/include/content-app-observer/ContentAppObserver.h
@@ -18,9 +18,7 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
 #include <app/clusters/content-app-observer/content-app-observer.h>
-#include <vector>
 
 using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
 using ContentAppMessageResponse  = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;

diff --git a/examples/tv-app/android/include/content-control/ContentController.h b/examples/tv-app/android/include/content-control/ContentController.h
@@ -18,9 +18,8 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
+#include <app/AttributeValueEncoder.h>
 #include <app/clusters/content-control-server/content-control-server.h>
-#include <vector>
 
 using ContentControlDelegate = chip::app::Clusters::ContentControl::Delegate;
 using ResetPINResponseType   = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Type;

diff --git a/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp b/examples/tv-app/android/java/ContentAppAttributeDelegate.cpp
@@ -22,7 +22,6 @@
 
 #include "ContentAppAttributeDelegate.h"
 #include <app-common/zap-generated/cluster-objects.h>
-#include <app/AttributeAccessInterface.h>
 #include <app/util/config.h>
 #include <jni.h>
 #include <lib/support/CHIPJNIError.h>

diff --git a/examples/tv-app/android/java/ContentAppAttributeDelegate.h b/examples/tv-app/android/java/ContentAppAttributeDelegate.h
@@ -23,7 +23,7 @@
 #pragma once
 
 #include <app-common/zap-generated/ids/Clusters.h>
-#include <app/AttributeAccessInterface.h>
+#include <app/ConcreteAttributePath.h>
 #include <jni.h>
 #include <lib/core/DataModelTypes.h>
 #include <lib/support/JniReferences.h>

diff --git a/examples/tv-app/android/java/ContentLauncherManager.cpp b/examples/tv-app/android/java/ContentLauncherManager.cpp
@@ -27,8 +27,6 @@
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
 
-#include <string>
-
 using namespace std;
 using namespace chip;
 using namespace chip::app::DataModel;

diff --git a/examples/tv-app/android/java/ContentLauncherManager.h b/examples/tv-app/android/java/ContentLauncherManager.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
+#include <app/AttributeValueEncoder.h>
 #include <app/clusters/content-launch-server/content-launch-server.h>
 #include <jni.h>
 #include <lib/core/CHIPError.h>

diff --git a/examples/tv-app/android/java/MediaInputManager.h b/examples/tv-app/android/java/MediaInputManager.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
+#include <app/AttributeValueEncoder.h>
 #include <app/clusters/media-input-server/media-input-server.h>
 #include <jni.h>
 #include <lib/support/JniReferences.h>

diff --git a/examples/tv-app/tv-common/clusters/content-app-observer/ContentAppObserver.h b/examples/tv-app/tv-common/clusters/content-app-observer/ContentAppObserver.h
@@ -18,9 +18,7 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
 #include <app/clusters/content-app-observer/content-app-observer.h>
-#include <vector>
 
 using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
 using ContentAppMessageResponse  = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;
@@ -32,6 +30,4 @@ class ContentAppObserverManager : public ContentAppObserverDelegate
 
     void HandleContentAppMessage(chip::app::CommandResponseHelper<ContentAppMessageResponse> & helper,
                                  const chip::Optional<chip::CharSpan> & data, const chip::CharSpan & encodingHint) override;
-
-protected:
 };
diff --git a/examples/tv-app/tv-common/clusters/content-control/ContentController.h b/examples/tv-app/tv-common/clusters/content-control/ContentController.h
@@ -18,9 +18,8 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
+#include <app/AttributeValueEncoder.h>
 #include <app/clusters/content-control-server/content-control-server.h>
-#include <vector>
 
 using ContentControlDelegate = chip::app::Clusters::ContentControl::Delegate;
 using ResetPINResponseType   = chip::app::Clusters::ContentControl::Commands::ResetPINResponse::Type;

diff --git a/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h b/examples/tv-app/tv-common/clusters/content-launcher/ContentLauncherManager.h
@@ -1,5 +1,4 @@
 /*
- *
  *    Copyright (c) 2021 Project CHIP Authors
  *    All rights reserved.
  *
@@ -15,10 +14,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-
 #pragma once
 
 #include <app/clusters/content-launch-server/content-launch-server.h>
+
+#include <list>
 #include <string>
 #include <vector>
 

diff --git a/examples/tv-app/tv-common/clusters/media-input/MediaInputManager.h b/examples/tv-app/tv-common/clusters/media-input/MediaInputManager.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
+#include <app/AttributeValueEncoder.h>
 #include <app/clusters/media-input-server/media-input-server.h>
 #include <vector>
 

diff --git a/examples/tv-casting-app/tv-casting-common/clusters/content-app-observer/ContentAppObserver.h b/examples/tv-casting-app/tv-casting-common/clusters/content-app-observer/ContentAppObserver.h
@@ -18,9 +18,7 @@
 
 #pragma once
 
-#include <app/AttributeAccessInterface.h>
 #include <app/clusters/content-app-observer/content-app-observer.h>
-#include <vector>
 
 using ContentAppObserverDelegate = chip::app::Clusters::ContentAppObserver::Delegate;
 using ContentAppMessageResponse  = chip::app::Clusters::ContentAppObserver::Commands::ContentAppMessageResponse::Type;