Rename several IM IB in MessageDef

--Rename AttributeStatuses to AttributeStatusIBs
--Rename EventFilters to EventFilterIBs
--Rename EventPaths to EventPathIBs
--Rename EventReports to EventReportIBs
--Rename InvokeRequests to CommandDataIBs
--Rename InvokeResponse to InvokeResponseIBs

src/app/BUILD.gn

@@ -68,32 +68,32 @@ static_library("app") {
     "MessageDef/AttributeReportIBs.h",
     "MessageDef/AttributeStatusIB.cpp",
     "MessageDef/AttributeStatusIB.h",
-    "MessageDef/AttributeStatuses.cpp",
-    "MessageDef/AttributeStatuses.h",
+    "MessageDef/AttributeStatusIBs.cpp",
+    "MessageDef/AttributeStatusIBs.h",
     "MessageDef/Builder.cpp",
     "MessageDef/Builder.h",
     "MessageDef/CommandDataIB.cpp",
+    "MessageDef/CommandDataIBs.cpp",
     "MessageDef/CommandPathIB.cpp",
     "MessageDef/CommandStatusIB.cpp",
     "MessageDef/EventDataIB.cpp",
     "MessageDef/EventDataIB.h",
     "MessageDef/EventFilterIB.cpp",
-    "MessageDef/EventFilters.cpp",
+    "MessageDef/EventFilterIBs.cpp",
     "MessageDef/EventPathIB.cpp",
     "MessageDef/EventPathIB.h",
-    "MessageDef/EventPaths.cpp",
-    "MessageDef/EventPaths.h",
+    "MessageDef/EventPathIBs.cpp",
+    "MessageDef/EventPathIBs.h",
     "MessageDef/EventReportIB.cpp",
     "MessageDef/EventReportIB.h",
-    "MessageDef/EventReports.cpp",
-    "MessageDef/EventReports.h",
+    "MessageDef/EventReportIBs.cpp",
+    "MessageDef/EventReportIBs.h",
     "MessageDef/EventStatusIB.cpp",
     "MessageDef/EventStatusIB.h",
     "MessageDef/InvokeRequestMessage.cpp",
-    "MessageDef/InvokeRequests.cpp",
     "MessageDef/InvokeResponseIB.cpp",
+    "MessageDef/InvokeResponseIBs.cpp",
     "MessageDef/InvokeResponseMessage.cpp",
-    "MessageDef/InvokeResponses.cpp",
     "MessageDef/ListBuilder.cpp",
     "MessageDef/ListParser.cpp",
     "MessageDef/MessageDefHelper.cpp",

src/app/CommandHandler.cpp

@@ -90,7 +90,7 @@ CHIP_ERROR CommandHandler::ProcessInvokeRequest(System::PacketBufferHandle && pa
     System::PacketBufferTLVReader reader;
     TLV::TLVReader invokeRequestsReader;
     InvokeRequestMessage::Parser invokeRequestMessage;
-    InvokeRequests::Parser invokeRequests;
+    CommandDataIBs::Parser invokeRequests;
     reader.Init(std::move(payload));
     ReturnErrorOnFailure(reader.Next());
     ReturnErrorOnFailure(invokeRequestMessage.Init(reader));

src/app/CommandSender.cpp

@@ -130,7 +130,7 @@ CHIP_ERROR CommandSender::ProcessInvokeResponse(System::PacketBufferHandle && pa
     System::PacketBufferTLVReader reader;
     TLV::TLVReader invokeResponsesReader;
     InvokeResponseMessage::Parser invokeResponseMessage;
-    InvokeResponses::Parser invokeResponses;
+    InvokeResponseIBs::Parser invokeResponses;
     bool suppressResponse = false;
 
     reader.Init(std::move(payload));

src/app/MessageDef/AttributePathIBs.cpp

@@ -73,7 +73,7 @@ CHIP_ERROR AttributePathIBs::Parser::CheckSchemaValidity() const
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
-AttributePathIB::Builder & AttributePathIBs::Builder::CreateAttributePath()
+AttributePathIB::Builder & AttributePathIBs::Builder::CreatePath()
 {
     if (mError == CHIP_NO_ERROR)
     {

src/app/MessageDef/AttributePathIBs.h

@@ -61,7 +61,7 @@ class Builder : public ArrayBuilder
      *
      *  @return A reference to AttributePathIB::Builder
      */
-    AttributePathIB::Builder & CreateAttributePath();
+    AttributePathIB::Builder & CreatePath();
 
     /**
      *  @brief Mark the end of this AttributePathIB

src/app/MessageDef/AttributeStatuses.cpp → src/app/MessageDef/AttributeStatusIBs.cpp

@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include "AttributeStatuses.h"
+#include "AttributeStatusIBs.h"
 #include "AttributeStatusIB.h"
 
 #include "MessageDefHelper.h"
@@ -29,7 +29,7 @@
 
 namespace chip {
 namespace app {
-AttributeStatusIB::Builder & AttributeStatuses::Builder::CreateAttributeStatus()
+AttributeStatusIB::Builder & AttributeStatusIBs::Builder::CreateAttributeStatus()
 {
     if (mError == CHIP_NO_ERROR)
     {
@@ -38,23 +38,23 @@ AttributeStatusIB::Builder & AttributeStatuses::Builder::CreateAttributeStatus()
     return mAttributeStatus;
 }
 
-AttributeStatuses::Builder & AttributeStatuses::Builder::EndOfAttributeStatuses()
+AttributeStatusIBs::Builder & AttributeStatusIBs::Builder::EndOfAttributeStatuses()
 {
     EndOfContainer();
     return *this;
 }
 
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR AttributeStatuses::Parser::CheckSchemaValidity() const
+CHIP_ERROR AttributeStatusIBs::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err            = CHIP_NO_ERROR;
     size_t NumAttributeStatus = 0;
     TLV::TLVReader reader;
 
-    PRETTY_PRINT("AttributeStatuses =");
+    PRETTY_PRINT("AttributeStatusIBs =");
     PRETTY_PRINT("[");
 
-    // make a copy of the EventReports reader
+    // make a copy of the AttributeStatusIBs reader
     reader.Init(mReader);
 
     while (CHIP_NO_ERROR == (err = reader.Next()))

src/app/MessageDef/AttributeStatuses.h → src/app/MessageDef/AttributeStatusIBs.h

@@ -31,7 +31,7 @@
 
 namespace chip {
 namespace app {
-namespace AttributeStatuses {
+namespace AttributeStatusIBs {
 class Builder : public ArrayBuilder
 {
 public:
@@ -43,11 +43,11 @@ class Builder : public ArrayBuilder
     AttributeStatusIB::Builder & CreateAttributeStatus();
 
     /**
-     *  @brief Mark the end of this AttributeStatuses
+     *  @brief Mark the end of this AttributeStatusIBs
      *
      *  @return A reference to *this
      */
-    AttributeStatuses::Builder & EndOfAttributeStatuses();
+    AttributeStatusIBs::Builder & EndOfAttributeStatuses();
 
 private:
     AttributeStatusIB::Builder mAttributeStatus;
@@ -73,6 +73,6 @@ class Parser : public ArrayParser
     CHIP_ERROR CheckSchemaValidity() const;
 #endif
 };
-} // namespace AttributeStatuses
+} // namespace AttributeStatusIBs
 } // namespace app
 } // namespace chip

src/app/MessageDef/InvokeRequests.cpp → src/app/MessageDef/CommandDataIBs.cpp

@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-#include "InvokeRequests.h"
+#include "CommandDataIBs.h"
 
 #include "MessageDefHelper.h"
 
@@ -27,13 +27,13 @@
 namespace chip {
 namespace app {
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR InvokeRequests::Parser::CheckSchemaValidity() const
+CHIP_ERROR CommandDataIBs::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err         = CHIP_NO_ERROR;
     size_t numCommandDatas = 0;
     TLV::TLVReader reader;
 
-    PRETTY_PRINT("InvokeRequests =");
+    PRETTY_PRINT("CommandDataIBs =");
     PRETTY_PRINT("[");
 
     // make a copy of the reader
@@ -71,7 +71,7 @@ CHIP_ERROR InvokeRequests::Parser::CheckSchemaValidity() const
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
-CommandDataIB::Builder & InvokeRequests::Builder::CreateCommandData()
+CommandDataIB::Builder & CommandDataIBs::Builder::CreateCommandData()
 {
     if (mError == CHIP_NO_ERROR)
     {
@@ -80,7 +80,7 @@ CommandDataIB::Builder & InvokeRequests::Builder::CreateCommandData()
     return mCommandData;
 }
 
-InvokeRequests::Builder & InvokeRequests::Builder::EndOfInvokeRequests()
+CommandDataIBs::Builder & CommandDataIBs::Builder::EndOfInvokeRequests()
 {
     EndOfContainer();
     return *this;

src/app/MessageDef/InvokeRequests.h → src/app/MessageDef/CommandDataIBs.h

@@ -30,7 +30,7 @@
 
 namespace chip {
 namespace app {
-namespace InvokeRequests {
+namespace CommandDataIBs {
 class Parser : public ArrayParser
 {
 public:
@@ -68,15 +68,15 @@ class Builder : public ArrayBuilder
     CommandDataIB::Builder & GetCommandData() { return mCommandData; };
 
     /**
-     *  @brief Mark the end of this InvokeRequests
+     *  @brief Mark the end of this CommandDataIBs
      *
      *  @return A reference to *this
      */
-    InvokeRequests::Builder & EndOfInvokeRequests();
+    CommandDataIBs::Builder & EndOfInvokeRequests();
 
 private:
     CommandDataIB::Builder mCommandData;
 };
-} // namespace InvokeRequests
+} // namespace CommandDataIBs
 } // namespace app
 } // namespace chip

src/app/MessageDef/EventFilters.cpp → src/app/MessageDef/EventFilterIBs.cpp

@@ -13,13 +13,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-/**
- *    @file
- *      This file defines EventFilters parser and builder in CHIP interaction model
- *
- */
 
-#include "EventFilters.h"
+#include "EventFilterIBs.h"
 
 #include "MessageDefHelper.h"
 
@@ -32,13 +27,13 @@
 namespace chip {
 namespace app {
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR EventFilters::Parser::CheckSchemaValidity() const
+CHIP_ERROR EventFilterIBs::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err         = CHIP_NO_ERROR;
     size_t numEventFilters = 0;
     TLV::TLVReader reader;
 
-    PRETTY_PRINT("EventFilters =");
+    PRETTY_PRINT("EventFilterIBs =");
     PRETTY_PRINT("[");
 
     // make a copy of the reader
@@ -76,13 +71,13 @@ CHIP_ERROR EventFilters::Parser::CheckSchemaValidity() const
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
-EventFilterIB::Builder & EventFilters::Builder::CreateEventFilter()
+EventFilterIB::Builder & EventFilterIBs::Builder::CreateEventFilter()
 {
     mError = mEventFilter.Init(mpWriter);
     return mEventFilter;
 }
 
-EventFilters::Builder & EventFilters::Builder::EndOfEventFilters()
+EventFilterIBs::Builder & EventFilterIBs::Builder::EndOfEventFilters()
 {
     EndOfContainer();
     return *this;

src/app/MessageDef/EventFilters.h → src/app/MessageDef/EventFilterIBs.h

@@ -14,11 +14,6 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-/**
- *    @file
- *      This file defines EventFilters parser and builder in CHIP interaction model
- *
- */
 
 #pragma once
 
@@ -35,7 +30,7 @@
 
 namespace chip {
 namespace app {
-namespace EventFilters {
+namespace EventFilterIBs {
 class Parser : public ArrayParser
 {
 public:
@@ -73,15 +68,15 @@ class Builder : public ArrayBuilder
     EventFilterIB::Builder & GetEventFilter() { return mEventFilter; };
 
     /**
-     *  @brief Mark the end of this EventFilters
+     *  @brief Mark the end of this EventFilterIBs
      *
      *  @return A reference to *this
      */
-    EventFilters::Builder & EndOfEventFilters();
+    EventFilterIBs::Builder & EndOfEventFilters();
 
 private:
     EventFilterIB::Builder mEventFilter;
 };
-}; // namespace EventFilters
+}; // namespace EventFilterIBs
 }; // namespace app
 }; // namespace chip

src/app/MessageDef/EventPaths.cpp → src/app/MessageDef/EventPathIBs.cpp

@@ -15,13 +15,8 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-/**
- *    @file
- *      This file defines EventPaths parser and builder in CHIP interaction model
- *
- */
 
-#include "EventPaths.h"
+#include "EventPathIBs.h"
 
 #include "MessageDefHelper.h"
 
@@ -34,16 +29,16 @@
 namespace chip {
 namespace app {
 #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR EventPaths::Parser::CheckSchemaValidity() const
+CHIP_ERROR EventPathIBs::Parser::CheckSchemaValidity() const
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
     size_t NumPath = 0;
     TLV::TLVReader reader;
 
-    PRETTY_PRINT("EventPaths =");
+    PRETTY_PRINT("EventPathIBs =");
     PRETTY_PRINT("[");
 
-    // make a copy of the EventPaths reader
+    // make a copy of the EventPathIBs reader
     reader.Init(mReader);
 
     while (CHIP_NO_ERROR == (err = reader.Next()))
@@ -77,7 +72,7 @@ CHIP_ERROR EventPaths::Parser::CheckSchemaValidity() const
 }
 #endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
 
-EventPathIB::Builder & EventPaths::Builder::CreatePath()
+EventPathIB::Builder & EventPathIBs::Builder::CreatePath()
 {
     if (mError == CHIP_NO_ERROR)
     {
@@ -86,7 +81,7 @@ EventPathIB::Builder & EventPaths::Builder::CreatePath()
     return mEventPath;
 }
 
-EventPaths::Builder & EventPaths::Builder::EndOfEventPaths()
+EventPathIBs::Builder & EventPathIBs::Builder::EndOfEventPaths()
 {
     EndOfContainer();
     return *this;