Im/write cluster object

src/app/ConcreteAttributePath.h

@@ -0,0 +1,41 @@
+/*
+ *
+ * Copyright (c) 2021 Project CHIP Authors
+ * All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <app/util/basic-types.h>
+#include <lib/core/Optional.h>
+
+namespace chip {
+namespace app {
+
+/**
+ * A representation of a concrete invoke path.
+ */
+struct ConcreteAttributePath
+{
+ ConcreteAttributePath(EndpointId aEndpointId, ClusterId aClusterId, AttributeId aAttributeId) :
+ mEndpointId(aEndpointId), mClusterId(aClusterId), mAttributeId(aAttributeId)
+ {}
+
+ const EndpointId mEndpointId = 0;
+ const ClusterId mClusterId = 0;
+ const AttributeId mAttributeId = 0;
+};
+} // namespace app
+} // namespace chip

src/app/InteractionModelDelegate.h

@@ -100,46 +100,6 @@ class InteractionModelDelegate
  */
  virtual CHIP_ERROR ReadError(const ReadClient * apReadClient, CHIP_ERROR aError) { return CHIP_ERROR_NOT_IMPLEMENTED; }
 
- /**
- * Notification that a WriteClient has received a Write Response containing a status code.
- * aAttributeIndex is processing attribute index which can identify attribute if there exists multiple attribute changes with
- * same attribute path
- */
- virtual CHIP_ERROR WriteResponseStatus(const WriteClient * apWriteClient,
- const Protocols::SecureChannel::GeneralStatusCode aGeneralCode,
- const uint32_t aProtocolId, const uint16_t aProtocolCode,
- AttributePathParams & aAttributePathParams, uint8_t aAttributeIndex)
- {
- return CHIP_ERROR_NOT_IMPLEMENTED;
- }
-
- /**
- * Notification that a Write Response has been processed and application can do further work .
- */
- virtual CHIP_ERROR WriteResponseProcessed(const WriteClient * apWriteClient) { return CHIP_ERROR_NOT_IMPLEMENTED; }
-
- /**
- * Notification that a Write Client has received a Write Response and fails to process a attribute data element in that
- * write response
- */
- virtual CHIP_ERROR WriteResponseProtocolError(const WriteClient * apWriteClient, uint8_t aAttributeIndex)
- {
- return CHIP_ERROR_NOT_IMPLEMENTED;
- }
-
- /**
- * Notification that a write client encountered an asynchronous failure.
- * @param[in] apWriteClient A current write client which can identify the write client to the consumer, particularly
- * during multiple write interactions
- * @param[in] aError A error that could be CHIP_ERROR_TIMEOUT when write client fails to receive, or other error when
- * fail to process write response.
- * @retval # CHIP_ERROR_NOT_IMPLEMENTED if not implemented
- */
- virtual CHIP_ERROR WriteResponseError(const WriteClient * apWriteClient, CHIP_ERROR aError)
- {
- return CHIP_ERROR_NOT_IMPLEMENTED;
- }
-
  /**
  * Notification that a Subscribe Response has been processed and application can do further work .
  */

src/app/InteractionModelEngine.cpp

@@ -95,14 +95,6 @@ void InteractionModelEngine::Shutdown()
  }
  }
 
- for (auto & writeClient : mWriteClients)
- {
- if (!writeClient.IsFree())
- {
- writeClient.Shutdown();
- }
- }
-
  for (auto & writeHandler : mWriteHandlers)
  {
  VerifyOrDie(writeHandler.IsFree());
@@ -142,25 +134,6 @@ CHIP_ERROR InteractionModelEngine::NewReadClient(ReadClient ** const apReadClien
  return err;
 }
 
-CHIP_ERROR InteractionModelEngine::NewWriteClient(WriteClientHandle & apWriteClient, uint64_t aApplicationIdentifier)
-{
- apWriteClient.SetWriteClient(nullptr);
-
- for (auto & writeClient : mWriteClients)
- {
- if (!writeClient.IsFree())
- {
- continue;
- }
-
- ReturnLogErrorOnFailure(writeClient.Init(mpExchangeMgr, mpDelegate, aApplicationIdentifier));
- apWriteClient.SetWriteClient(&writeClient);
- return CHIP_NO_ERROR;
- }
-
- return CHIP_ERROR_NO_MEMORY;
-}
-
 CHIP_ERROR InteractionModelEngine::OnUnknownMsgType(Messaging::ExchangeContext * apExchangeContext,
  const PayloadHeader & aPayloadHeader, System::PacketBufferHandle && aPayload)
 {
@@ -350,11 +323,6 @@ uint16_t InteractionModelEngine::GetReadClientArrayIndex(const ReadClient * cons
  return static_cast<uint16_t>(apReadClient - mReadClients);
 }
 
-uint16_t InteractionModelEngine::GetWriteClientArrayIndex(const WriteClient * const apWriteClient) const
-{
- return static_cast<uint16_t>(apWriteClient - mWriteClients);
-}
-
 void InteractionModelEngine::ReleaseClusterInfoList(ClusterInfo *& aClusterInfo)
 {
  ClusterInfo * lastClusterInfo = aClusterInfo;

src/app/InteractionModelEngine.h

@@ -110,20 +110,6 @@ class InteractionModelEngine : public Messaging::ExchangeDelegate, public Comman
  * @retval #CHIP_NO_ERROR On success.
  */
  CHIP_ERROR SendSubscribeRequest(ReadPrepareParams & aReadPrepareParams, uint64_t aAppIdentifier = 0);
- /**
- * Retrieve a WriteClient that the SDK consumer can use to send a write. If the call succeeds,
- * see WriteClient documentation for lifetime handling.
- *
- * The Write interaction is more like Invoke interaction (cluster specific commands) since it will include cluster specific
- * payload, and may have the need to encode non-scalar values (like structs and arrays). Thus we use WriteClientHandle to
- * prevent user's code from leaking WriteClients.
- *
- * @param[out] apWriteClient A pointer to the WriteClient object.
- *
- * @retval #CHIP_ERROR_NO_MEMORY If there is no WriteClient available
- * @retval #CHIP_NO_ERROR On success.
- */
- CHIP_ERROR NewWriteClient(WriteClientHandle & apWriteClient, uint64_t aApplicationIdentifier = 0);
 
  /**
  * Get read client index in mReadClients
@@ -197,7 +183,6 @@ class InteractionModelEngine : public Messaging::ExchangeDelegate, public Comman
  BitMapObjectPool<CommandHandler, CHIP_IM_MAX_NUM_COMMAND_HANDLER> mCommandHandlerObjs;
  ReadClient mReadClients[CHIP_IM_MAX_NUM_READ_CLIENT];
  ReadHandler mReadHandlers[CHIP_IM_MAX_NUM_READ_HANDLER];
- WriteClient mWriteClients[CHIP_IM_MAX_NUM_WRITE_CLIENT];
  WriteHandler mWriteHandlers[CHIP_IM_MAX_NUM_WRITE_HANDLER];
  reporting::Engine mReportingEngine;
  ClusterInfo mClusterInfoPool[CHIP_IM_SERVER_MAX_NUM_PATH_GROUPS];