Rename several IM IB in MessageDef (#12516)
--Rename AttributeStatuses to AttributeStatusIBs
--Rename EventFilters to EventFilterIBs
--Rename EventPaths to EventPathIBs
--Rename EventReports to EventReportIBs
--Rename InvokeResponse to InvokeResponseIBs
diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index 545c532..67421b0 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -68,8 +68,8 @@
"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",
@@ -78,22 +78,22 @@
"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",
diff --git a/src/app/CommandSender.cpp b/src/app/CommandSender.cpp
index 9e3da0b..e7eaaae 100644
--- a/src/app/CommandSender.cpp
+++ b/src/app/CommandSender.cpp
@@ -130,7 +130,7 @@
System::PacketBufferTLVReader reader;
TLV::TLVReader invokeResponsesReader;
InvokeResponseMessage::Parser invokeResponseMessage;
- InvokeResponses::Parser invokeResponses;
+ InvokeResponseIBs::Parser invokeResponses;
bool suppressResponse = false;
reader.Init(std::move(payload));
diff --git a/src/app/MessageDef/AttributePathIBs.cpp b/src/app/MessageDef/AttributePathIBs.cpp
index c78988e..30fc848 100644
--- a/src/app/MessageDef/AttributePathIBs.cpp
+++ b/src/app/MessageDef/AttributePathIBs.cpp
@@ -73,7 +73,7 @@
}
#endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-AttributePathIB::Builder & AttributePathIBs::Builder::CreateAttributePath()
+AttributePathIB::Builder & AttributePathIBs::Builder::CreatePath()
{
if (mError == CHIP_NO_ERROR)
{
diff --git a/src/app/MessageDef/AttributePathIBs.h b/src/app/MessageDef/AttributePathIBs.h
index e8a4704..ad6929f 100644
--- a/src/app/MessageDef/AttributePathIBs.h
+++ b/src/app/MessageDef/AttributePathIBs.h
@@ -61,7 +61,7 @@
*
* @return A reference to AttributePathIB::Builder
*/
- AttributePathIB::Builder & CreateAttributePath();
+ AttributePathIB::Builder & CreatePath();
/**
* @brief Mark the end of this AttributePathIB
diff --git a/src/app/MessageDef/AttributeStatuses.cpp b/src/app/MessageDef/AttributeStatusIBs.cpp
similarity index 86%
rename from src/app/MessageDef/AttributeStatuses.cpp
rename to src/app/MessageDef/AttributeStatusIBs.cpp
index f814c0b..c604a4b 100644
--- a/src/app/MessageDef/AttributeStatuses.cpp
+++ b/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 @@
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()))
diff --git a/src/app/MessageDef/AttributeStatuses.h b/src/app/MessageDef/AttributeStatusIBs.h
similarity index 92%
rename from src/app/MessageDef/AttributeStatuses.h
rename to src/app/MessageDef/AttributeStatusIBs.h
index e183280..b6a70ab 100644
--- a/src/app/MessageDef/AttributeStatuses.h
+++ b/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 @@
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 @@
CHIP_ERROR CheckSchemaValidity() const;
#endif
};
-} // namespace AttributeStatuses
+} // namespace AttributeStatusIBs
} // namespace app
} // namespace chip
diff --git a/src/app/MessageDef/EventFilters.cpp b/src/app/MessageDef/EventFilterIBs.cpp
similarity index 84%
rename from src/app/MessageDef/EventFilters.cpp
rename to src/app/MessageDef/EventFilterIBs.cpp
index ce72f0b..97cc23e 100644
--- a/src/app/MessageDef/EventFilters.cpp
+++ b/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 @@
}
#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;
diff --git a/src/app/MessageDef/EventFilters.h b/src/app/MessageDef/EventFilterIBs.h
similarity index 89%
rename from src/app/MessageDef/EventFilters.h
rename to src/app/MessageDef/EventFilterIBs.h
index fb67e73..4e86f5c 100644
--- a/src/app/MessageDef/EventFilters.h
+++ b/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 @@
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
diff --git a/src/app/MessageDef/EventPaths.cpp b/src/app/MessageDef/EventPathIBs.cpp
similarity index 84%
rename from src/app/MessageDef/EventPaths.cpp
rename to src/app/MessageDef/EventPathIBs.cpp
index 08bb866..2002f7d 100644
--- a/src/app/MessageDef/EventPaths.cpp
+++ b/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 @@
}
#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 @@
return mEventPath;
}
-EventPaths::Builder & EventPaths::Builder::EndOfEventPaths()
+EventPathIBs::Builder & EventPathIBs::Builder::EndOfEventPaths()
{
EndOfContainer();
return *this;
diff --git a/src/app/MessageDef/EventPaths.h b/src/app/MessageDef/EventPathIBs.h
similarity index 88%
rename from src/app/MessageDef/EventPaths.h
rename to src/app/MessageDef/EventPathIBs.h
index 632a852..14a909a 100644
--- a/src/app/MessageDef/EventPaths.h
+++ b/src/app/MessageDef/EventPathIBs.h
@@ -15,18 +15,13 @@
* 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
- *
- */
#pragma once
#include "ArrayBuilder.h"
#include "ArrayParser.h"
#include "EventPathIB.h"
-#include "EventPaths.h"
+#include "EventPathIBs.h"
#include <app/AppBuildConfig.h>
#include <app/util/basic-types.h>
@@ -37,7 +32,7 @@
namespace chip {
namespace app {
-namespace EventPaths {
+namespace EventPathIBs {
class Parser : public ArrayParser
{
public:
@@ -70,15 +65,15 @@
EventPathIB::Builder & CreatePath();
/**
- * @brief Mark the end of this EventPaths
+ * @brief Mark the end of this EventPathIBs
*
* @return A reference to *this
*/
- EventPaths::Builder & EndOfEventPaths();
+ EventPathIBs::Builder & EndOfEventPaths();
private:
EventPathIB::Builder mEventPath;
};
-} // namespace EventPaths
+} // namespace EventPathIBs
} // namespace app
} // namespace chip
diff --git a/src/app/MessageDef/EventReports.cpp b/src/app/MessageDef/EventReportIBs.cpp
similarity index 86%
rename from src/app/MessageDef/EventReports.cpp
rename to src/app/MessageDef/EventReportIBs.cpp
index 379834a..47d3fc1 100644
--- a/src/app/MessageDef/EventReports.cpp
+++ b/src/app/MessageDef/EventReportIBs.cpp
@@ -17,11 +17,11 @@
*/
/**
* @file
- * This file defines EventReports parser and builder in CHIP interaction model
+ * This file defines EventReportIBs parser and builder in CHIP interaction model
*
*/
-#include "EventReports.h"
+#include "EventReportIBs.h"
#include "MessageDefHelper.h"
#include <inttypes.h>
@@ -33,13 +33,13 @@
namespace chip {
namespace app {
#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR EventReports::Parser::CheckSchemaValidity() const
+CHIP_ERROR EventReportIBs::Parser::CheckSchemaValidity() const
{
CHIP_ERROR err = CHIP_NO_ERROR;
size_t numEventReports = 0;
TLV::TLVReader reader;
- PRETTY_PRINT("EventReports =");
+ PRETTY_PRINT("EventReportIBs =");
PRETTY_PRINT("[");
// make a copy of the reader
@@ -82,7 +82,7 @@
}
#endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-EventReportIB::Builder & EventReports::Builder::CreateEventReport()
+EventReportIB::Builder & EventReportIBs::Builder::CreateEventReport()
{
if (mError == CHIP_NO_ERROR)
{
@@ -91,7 +91,7 @@
return mEventReport;
}
-EventReports::Builder & EventReports::Builder::EndOfEventReports()
+EventReportIBs::Builder & EventReportIBs::Builder::EndOfEventReports()
{
EndOfContainer();
return *this;
diff --git a/src/app/MessageDef/EventReports.h b/src/app/MessageDef/EventReportIBs.h
similarity index 89%
rename from src/app/MessageDef/EventReports.h
rename to src/app/MessageDef/EventReportIBs.h
index 3e9e241..d7a25c7 100644
--- a/src/app/MessageDef/EventReports.h
+++ b/src/app/MessageDef/EventReportIBs.h
@@ -17,7 +17,7 @@
*/
/**
* @file
- * This file defines EventReports parser and builder in CHIP interaction model
+ * This file defines EventReportIBs parser and builder in CHIP interaction model
*
*/
@@ -36,7 +36,7 @@
namespace chip {
namespace app {
-namespace EventReports {
+namespace EventReportIBs {
class Parser : public ArrayParser
{
public:
@@ -69,15 +69,15 @@
EventReportIB::Builder & CreateEventReport();
/**
- * @brief Mark the end of this EventReports
+ * @brief Mark the end of this EventReportIBs
*
* @return A reference to *this
*/
- EventReports::Builder & EndOfEventReports();
+ EventReportIBs::Builder & EndOfEventReports();
private:
EventReportIB::Builder mEventReport;
};
-} // namespace EventReports
+} // namespace EventReportIBs
} // namespace app
} // namespace chip
diff --git a/src/app/MessageDef/InvokeResponses.cpp b/src/app/MessageDef/InvokeResponseIBs.cpp
similarity index 87%
rename from src/app/MessageDef/InvokeResponses.cpp
rename to src/app/MessageDef/InvokeResponseIBs.cpp
index 6380bea..a4c8717 100644
--- a/src/app/MessageDef/InvokeResponses.cpp
+++ b/src/app/MessageDef/InvokeResponseIBs.cpp
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "InvokeResponses.h"
+#include "InvokeResponseIBs.h"
#include "MessageDefHelper.h"
@@ -27,13 +27,13 @@
namespace chip {
namespace app {
#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR InvokeResponses::Parser::CheckSchemaValidity() const
+CHIP_ERROR InvokeResponseIBs::Parser::CheckSchemaValidity() const
{
CHIP_ERROR err = CHIP_NO_ERROR;
size_t numInvokeResponses = 0;
TLV::TLVReader reader;
- PRETTY_PRINT("InvokeResponses =");
+ PRETTY_PRINT("InvokeResponseIBs =");
PRETTY_PRINT("[");
// make a copy of the reader
@@ -71,7 +71,7 @@
}
#endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-InvokeResponseIB::Builder & InvokeResponses::Builder::CreateInvokeResponse()
+InvokeResponseIB::Builder & InvokeResponseIBs::Builder::CreateInvokeResponse()
{
if (mError == CHIP_NO_ERROR)
{
@@ -80,7 +80,7 @@
return mInvokeResponse;
}
-InvokeResponses::Builder & InvokeResponses::Builder::EndOfInvokeResponses()
+InvokeResponseIBs::Builder & InvokeResponseIBs::Builder::EndOfInvokeResponses()
{
EndOfContainer();
return *this;
diff --git a/src/app/MessageDef/InvokeResponses.h b/src/app/MessageDef/InvokeResponseIBs.h
similarity index 92%
rename from src/app/MessageDef/InvokeResponses.h
rename to src/app/MessageDef/InvokeResponseIBs.h
index b4759c0..5b625f8 100644
--- a/src/app/MessageDef/InvokeResponses.h
+++ b/src/app/MessageDef/InvokeResponseIBs.h
@@ -30,7 +30,7 @@
namespace chip {
namespace app {
-namespace InvokeResponses {
+namespace InvokeResponseIBs {
class Parser : public ArrayParser
{
public:
@@ -68,15 +68,15 @@
InvokeResponseIB::Builder & GetInvokeResponse() { return mInvokeResponse; };
/**
- * @brief Mark the end of this InvokeResponses
+ * @brief Mark the end of this InvokeResponseIBs
*
* @return A reference to *this
*/
- InvokeResponses::Builder & EndOfInvokeResponses();
+ InvokeResponseIBs::Builder & EndOfInvokeResponses();
private:
InvokeResponseIB::Builder mInvokeResponse;
};
-} // namespace InvokeResponses
+} // namespace InvokeResponseIBs
} // namespace app
} // namespace chip
diff --git a/src/app/MessageDef/InvokeResponseMessage.cpp b/src/app/MessageDef/InvokeResponseMessage.cpp
index 62d008d..c7643f7 100644
--- a/src/app/MessageDef/InvokeResponseMessage.cpp
+++ b/src/app/MessageDef/InvokeResponseMessage.cpp
@@ -61,7 +61,7 @@
VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kInvokeResponses))), CHIP_ERROR_INVALID_TLV_TAG);
TagPresenceMask |= (1 << to_underlying(Tag::kInvokeResponses));
{
- InvokeResponses::Parser invokeResponses;
+ InvokeResponseIBs::Parser invokeResponses;
ReturnErrorOnFailure(invokeResponses.Init(reader));
PRETTY_PRINT_INCDEPTH();
@@ -103,7 +103,7 @@
return GetSimpleValue(to_underlying(Tag::kSuppressResponse), TLV::kTLVType_Boolean, apSuppressResponse);
}
-CHIP_ERROR InvokeResponseMessage::Parser::GetInvokeResponses(InvokeResponses::Parser * const apStatus) const
+CHIP_ERROR InvokeResponseMessage::Parser::GetInvokeResponses(InvokeResponseIBs::Parser * const apStatus) const
{
TLV::TLVReader reader;
ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kInvokeResponses)), reader));
@@ -120,7 +120,7 @@
return *this;
}
-InvokeResponses::Builder & InvokeResponseMessage::Builder::CreateInvokeResponses()
+InvokeResponseIBs::Builder & InvokeResponseMessage::Builder::CreateInvokeResponses()
{
if (mError == CHIP_NO_ERROR)
{
diff --git a/src/app/MessageDef/InvokeResponseMessage.h b/src/app/MessageDef/InvokeResponseMessage.h
index d9aa0ad..7f7f87d 100644
--- a/src/app/MessageDef/InvokeResponseMessage.h
+++ b/src/app/MessageDef/InvokeResponseMessage.h
@@ -24,7 +24,7 @@
#include <lib/support/CodeUtils.h>
#include <lib/support/logging/CHIPLogging.h>
-#include "InvokeResponses.h"
+#include "InvokeResponseIBs.h"
#include "StructBuilder.h"
#include "StructParser.h"
@@ -73,7 +73,7 @@
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
- CHIP_ERROR GetInvokeResponses(InvokeResponses::Parser * const apInvokeResponses) const;
+ CHIP_ERROR GetInvokeResponses(InvokeResponseIBs::Parser * const apInvokeResponses) const;
};
class Builder : public StructBuilder
@@ -86,18 +86,18 @@
InvokeResponseMessage::Builder & SuppressResponse(const bool aSuppressResponse);
/**
- * @brief Initialize a InvokeResponses::Builder for writing into the TLV stream
+ * @brief Initialize a InvokeResponseIBs::Builder for writing into the TLV stream
*
- * @return A reference to InvokeResponses::Builder
+ * @return A reference to InvokeResponseIBs::Builder
*/
- InvokeResponses::Builder & CreateInvokeResponses();
+ InvokeResponseIBs::Builder & CreateInvokeResponses();
/**
- * @brief Get reference to InvokeResponses::Builder
+ * @brief Get reference to InvokeResponseIBs::Builder
*
- * @return A reference to InvokeResponses::Builder
+ * @return A reference to InvokeResponseIBs::Builder
*/
- InvokeResponses::Builder & GetInvokeResponses() { return mInvokeResponses; }
+ InvokeResponseIBs::Builder & GetInvokeResponses() { return mInvokeResponses; }
/**
* @brief Mark the end of this InvokeResponseMessage
@@ -107,7 +107,7 @@
InvokeResponseMessage::Builder & EndOfInvokeResponseMessage();
private:
- InvokeResponses::Builder mInvokeResponses;
+ InvokeResponseIBs::Builder mInvokeResponses;
};
} // namespace InvokeResponseMessage
} // namespace app
diff --git a/src/app/MessageDef/ReadRequestMessage.cpp b/src/app/MessageDef/ReadRequestMessage.cpp
index 4fbec50..626a6e3 100644
--- a/src/app/MessageDef/ReadRequestMessage.cpp
+++ b/src/app/MessageDef/ReadRequestMessage.cpp
@@ -62,7 +62,7 @@
VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventRequests))), CHIP_ERROR_INVALID_TLV_TAG);
TagPresenceMask |= (1 << to_underlying(Tag::kEventRequests));
{
- EventPaths::Parser eventRequests;
+ EventPathIBs::Parser eventRequests;
ReturnErrorOnFailure(eventRequests.Init(reader));
PRETTY_PRINT_INCDEPTH();
@@ -75,7 +75,7 @@
VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventFilters))), CHIP_ERROR_INVALID_TLV_TAG);
TagPresenceMask |= (1 << to_underlying(Tag::kEventFilters));
{
- EventFilters::Parser eventFilters;
+ EventFilterIBs::Parser eventFilters;
ReturnErrorOnFailure(eventFilters.Init(reader));
PRETTY_PRINT_INCDEPTH();
@@ -130,14 +130,14 @@
return apAttributeRequests->Init(reader);
}
-CHIP_ERROR ReadRequestMessage::Parser::GetEventRequests(EventPaths::Parser * const apEventRequests) const
+CHIP_ERROR ReadRequestMessage::Parser::GetEventRequests(EventPathIBs::Parser * const apEventRequests) const
{
TLV::TLVReader reader;
ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kEventRequests)), reader));
return apEventRequests->Init(reader);
}
-CHIP_ERROR ReadRequestMessage::Parser::GetEventFilters(EventFilters::Parser * const apEventFilters) const
+CHIP_ERROR ReadRequestMessage::Parser::GetEventFilters(EventFilterIBs::Parser * const apEventFilters) const
{
TLV::TLVReader reader;
ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kEventFilters)), reader));
@@ -159,7 +159,7 @@
return mAttributeRequests;
}
-EventPaths::Builder & ReadRequestMessage::Builder::CreateEventRequests()
+EventPathIBs::Builder & ReadRequestMessage::Builder::CreateEventRequests()
{
// skip if error has already been set
if (mError == CHIP_NO_ERROR)
@@ -169,7 +169,7 @@
return mEventRequests;
}
-EventFilters::Builder & ReadRequestMessage::Builder::CreateEventFilters()
+EventFilterIBs::Builder & ReadRequestMessage::Builder::CreateEventFilters()
{
// skip if error has already been set
if (mError == CHIP_NO_ERROR)
diff --git a/src/app/MessageDef/ReadRequestMessage.h b/src/app/MessageDef/ReadRequestMessage.h
index b3fe54d..8e5e3a0 100644
--- a/src/app/MessageDef/ReadRequestMessage.h
+++ b/src/app/MessageDef/ReadRequestMessage.h
@@ -19,8 +19,8 @@
#pragma once
#include "AttributePathIBs.h"
-#include "EventFilters.h"
-#include "EventPaths.h"
+#include "EventFilterIBs.h"
+#include "EventPathIBs.h"
#include <app/AppBuildConfig.h>
#include <app/util/basic-types.h>
@@ -79,15 +79,15 @@
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
- CHIP_ERROR GetEventRequests(EventPaths::Parser * const apEventRequests) const;
+ CHIP_ERROR GetEventRequests(EventPathIBs::Parser * const apEventRequests) const;
/**
- * @brief Get a TLVReader for the EventFilters. Next() must be called before accessing them.
+ * @brief Get a TLVReader for the EventFilterIBs. Next() must be called before accessing them.
*
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
- CHIP_ERROR GetEventFilters(EventFilters::Parser * const apEventFilters) const;
+ CHIP_ERROR GetEventFilters(EventFilterIBs::Parser * const apEventFilters) const;
/**
* @brief Get IsFabricFiltered boolean
@@ -111,18 +111,18 @@
AttributePathIBs::Builder & CreateAttributeRequests();
/**
- * @brief Initialize a EventPaths::Builder for writing into the TLV stream
+ * @brief Initialize a EventPathIBs::Builder for writing into the TLV stream
*
- * @return A reference to EventPaths::Builder
+ * @return A reference to EventPathIBs::Builder
*/
- EventPaths::Builder & CreateEventRequests();
+ EventPathIBs::Builder & CreateEventRequests();
/**
- * @brief Initialize a EventFilters::Builder for writing into the TLV stream
+ * @brief Initialize a EventFilterIBs::Builder for writing into the TLV stream
*
- * @return A reference to EventFilters::Builder
+ * @return A reference to EventFilterIBs::Builder
*/
- EventFilters::Builder & CreateEventFilters();
+ EventFilterIBs::Builder & CreateEventFilters();
/**
* @brief limits the data written within fabric-scoped lists to the accessing fabric
@@ -139,8 +139,8 @@
private:
AttributePathIBs::Builder mAttributeRequests;
- EventPaths::Builder mEventRequests;
- EventFilters::Builder mEventFilters;
+ EventPathIBs::Builder mEventRequests;
+ EventFilterIBs::Builder mEventFilters;
};
} // namespace ReadRequestMessage
} // namespace app
diff --git a/src/app/MessageDef/ReportDataMessage.cpp b/src/app/MessageDef/ReportDataMessage.cpp
index 1ba284f..7beb73b 100644
--- a/src/app/MessageDef/ReportDataMessage.cpp
+++ b/src/app/MessageDef/ReportDataMessage.cpp
@@ -40,10 +40,10 @@
CHIP_ERROR ReportDataMessage::Parser::CheckSchemaValidity() const
{
CHIP_ERROR err = CHIP_NO_ERROR;
- uint16_t TagPresenceMask = 0;
+ uint16_t tagPresenceMask = 0;
chip::TLV::TLVReader reader;
- AttributeReportIBs::Parser AttributeReportIBs;
- EventReports::Parser EventReports;
+ AttributeReportIBs::Parser attributeReportIBs;
+ EventReportIBs::Parser eventReportIBs;
PRETTY_PRINT("ReportDataMessage =");
PRETTY_PRINT("{");
@@ -58,8 +58,8 @@
switch (chip::TLV::TagNumFromTag(reader.GetTag()))
{
case kCsTag_SuppressResponse:
- VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_SuppressResponse)), err = CHIP_ERROR_INVALID_TLV_TAG);
- TagPresenceMask |= (1 << kCsTag_SuppressResponse);
+ VerifyOrExit(!(tagPresenceMask & (1 << kCsTag_SuppressResponse)), err = CHIP_ERROR_INVALID_TLV_TAG);
+ tagPresenceMask |= (1 << kCsTag_SuppressResponse);
VerifyOrExit(chip::TLV::kTLVType_Boolean == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
#if CHIP_DETAIL_LOGGING
{
@@ -71,8 +71,8 @@
#endif // CHIP_DETAIL_LOGGING
break;
case kCsTag_SubscriptionId:
- VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_SubscriptionId)), err = CHIP_ERROR_INVALID_TLV_TAG);
- TagPresenceMask |= (1 << kCsTag_SubscriptionId);
+ VerifyOrExit(!(tagPresenceMask & (1 << kCsTag_SubscriptionId)), err = CHIP_ERROR_INVALID_TLV_TAG);
+ tagPresenceMask |= (1 << kCsTag_SubscriptionId);
VerifyOrExit(chip::TLV::kTLVType_UnsignedInteger == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
#if CHIP_DETAIL_LOGGING
{
@@ -85,15 +85,15 @@
break;
case kCsTag_AttributeReportIBs:
// check if this tag has appeared before
- VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_AttributeReportIBs)), err = CHIP_ERROR_INVALID_TLV_TAG);
- TagPresenceMask |= (1 << kCsTag_AttributeReportIBs);
+ VerifyOrExit(!(tagPresenceMask & (1 << kCsTag_AttributeReportIBs)), err = CHIP_ERROR_INVALID_TLV_TAG);
+ tagPresenceMask |= (1 << kCsTag_AttributeReportIBs);
VerifyOrExit(chip::TLV::kTLVType_Array == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
#if CHIP_DETAIL_LOGGING
{
- AttributeReportIBs.Init(reader);
+ attributeReportIBs.Init(reader);
PRETTY_PRINT_INCDEPTH();
- err = AttributeReportIBs.CheckSchemaValidity();
+ err = attributeReportIBs.CheckSchemaValidity();
SuccessOrExit(err);
PRETTY_PRINT_DECDEPTH();
}
@@ -101,23 +101,23 @@
break;
case kCsTag_EventReports:
// check if this tag has appeared before
- VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_EventReports)), err = CHIP_ERROR_INVALID_TLV_TAG);
- TagPresenceMask |= (1 << kCsTag_EventReports);
+ VerifyOrExit(!(tagPresenceMask & (1 << kCsTag_EventReports)), err = CHIP_ERROR_INVALID_TLV_TAG);
+ tagPresenceMask |= (1 << kCsTag_EventReports);
VerifyOrExit(chip::TLV::kTLVType_Array == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
#if CHIP_DETAIL_LOGGING
{
- EventReports.Init(reader);
+ eventReportIBs.Init(reader);
PRETTY_PRINT_INCDEPTH();
- err = EventReports.CheckSchemaValidity();
+ err = eventReportIBs.CheckSchemaValidity();
SuccessOrExit(err);
PRETTY_PRINT_DECDEPTH();
}
#endif // CHIP_DETAIL_LOGGING
break;
case kCsTag_MoreChunkedMessages:
- VerifyOrExit(!(TagPresenceMask & (1 << kCsTag_MoreChunkedMessages)), err = CHIP_ERROR_INVALID_TLV_TAG);
- TagPresenceMask |= (1 << kCsTag_MoreChunkedMessages);
+ VerifyOrExit(!(tagPresenceMask & (1 << kCsTag_MoreChunkedMessages)), err = CHIP_ERROR_INVALID_TLV_TAG);
+ tagPresenceMask |= (1 << kCsTag_MoreChunkedMessages);
VerifyOrExit(chip::TLV::kTLVType_Boolean == reader.GetType(), err = CHIP_ERROR_WRONG_TLV_TYPE);
#if CHIP_DETAIL_LOGGING
{
@@ -178,7 +178,7 @@
return err;
}
-CHIP_ERROR ReportDataMessage::Parser::GetEventReports(EventReports::Parser * const apEventReports) const
+CHIP_ERROR ReportDataMessage::Parser::GetEventReports(EventReportIBs::Parser * const apEventReports) const
{
CHIP_ERROR err = CHIP_NO_ERROR;
chip::TLV::TLVReader reader;
@@ -236,7 +236,7 @@
return mAttributeReportIBsBuilder;
}
-EventReports::Builder & ReportDataMessage::Builder::CreateEventReports()
+EventReportIBs::Builder & ReportDataMessage::Builder::CreateEventReports()
{
// skip if error has already been set
if (mError == CHIP_NO_ERROR)
diff --git a/src/app/MessageDef/ReportDataMessage.h b/src/app/MessageDef/ReportDataMessage.h
index 0bd4f8d..3b8d098 100644
--- a/src/app/MessageDef/ReportDataMessage.h
+++ b/src/app/MessageDef/ReportDataMessage.h
@@ -31,7 +31,7 @@
#include <lib/support/logging/CHIPLogging.h>
#include "AttributeReportIBs.h"
-#include "EventReports.h"
+#include "EventReportIBs.h"
#include "StructBuilder.h"
#include "StructParser.h"
@@ -100,7 +100,7 @@
CHIP_ERROR GetAttributeReportIBs(AttributeReportIBs::Parser * const apAttributeReportIBs) const;
/**
- * @brief Get a TLVReader for the EventReports. Next() must be called before accessing them.
+ * @brief Get a TLVReader for the EventReportIBs. Next() must be called before accessing them.
*
* @param [in] apEventReports A pointer to apEventReports
*
@@ -108,7 +108,7 @@
* #CHIP_ERROR_WRONG_TLV_TYPE if there is such element but it's not a Array
* #CHIP_END_OF_TLV if there is no such element
*/
- CHIP_ERROR GetEventReports(EventReports::Parser * const apEventReports) const;
+ CHIP_ERROR GetEventReports(EventReportIBs::Parser * const apEventReports) const;
/**
* @brief Check whether there are more chunked messages in a transaction. Next() must be called before accessing them.
@@ -155,11 +155,11 @@
AttributeReportIBs::Builder & CreateAttributeReportIBs();
/**
- * @brief Initialize a EventReports::Builder for writing into the TLV stream
+ * @brief Initialize a EventReportIBs::Builder for writing into the TLV stream
*
- * @return A reference to EventReports::Builder
+ * @return A reference to EventReportIBs::Builder
*/
- EventReports::Builder & CreateEventReports();
+ EventReportIBs::Builder & CreateEventReports();
/**
* @brief This flag is set to ‘true’ when there are more chunked messages in a transaction.
@@ -177,7 +177,7 @@
private:
AttributeReportIBs::Builder mAttributeReportIBsBuilder;
- EventReports::Builder mEventReportsBuilder;
+ EventReportIBs::Builder mEventReportsBuilder;
};
}; // namespace ReportDataMessage
diff --git a/src/app/MessageDef/SubscribeRequestMessage.cpp b/src/app/MessageDef/SubscribeRequestMessage.cpp
index 6ba07ea..e01892f 100644
--- a/src/app/MessageDef/SubscribeRequestMessage.cpp
+++ b/src/app/MessageDef/SubscribeRequestMessage.cpp
@@ -94,7 +94,7 @@
VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventRequests))), CHIP_ERROR_INVALID_TLV_TAG);
TagPresenceMask |= (1 << to_underlying(Tag::kEventRequests));
{
- EventPaths::Parser eventRequests;
+ EventPathIBs::Parser eventRequests;
ReturnErrorOnFailure(eventRequests.Init(reader));
PRETTY_PRINT_INCDEPTH();
@@ -107,7 +107,7 @@
VerifyOrReturnError(!(TagPresenceMask & (1 << to_underlying(Tag::kEventFilters))), CHIP_ERROR_INVALID_TLV_TAG);
TagPresenceMask |= (1 << to_underlying(Tag::kEventFilters));
{
- EventFilters::Parser eventFilters;
+ EventFilterIBs::Parser eventFilters;
ReturnErrorOnFailure(eventFilters.Init(reader));
PRETTY_PRINT_INCDEPTH();
@@ -190,14 +190,14 @@
return apAttributeRequests->Init(reader);
}
-CHIP_ERROR SubscribeRequestMessage::Parser::GetEventRequests(EventPaths::Parser * const apEventRequests) const
+CHIP_ERROR SubscribeRequestMessage::Parser::GetEventRequests(EventPathIBs::Parser * const apEventRequests) const
{
TLV::TLVReader reader;
ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kEventRequests)), reader));
return apEventRequests->Init(reader);
}
-CHIP_ERROR SubscribeRequestMessage::Parser::GetEventFilters(EventFilters::Parser * const apEventFilters) const
+CHIP_ERROR SubscribeRequestMessage::Parser::GetEventFilters(EventFilterIBs::Parser * const apEventFilters) const
{
TLV::TLVReader reader;
ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kEventFilters)), reader));
@@ -252,7 +252,7 @@
return mAttributeRequests;
}
-EventPaths::Builder & SubscribeRequestMessage::Builder::CreateEventRequests()
+EventPathIBs::Builder & SubscribeRequestMessage::Builder::CreateEventRequests()
{
if (mError == CHIP_NO_ERROR)
{
@@ -261,7 +261,7 @@
return mEventRequests;
}
-EventFilters::Builder & SubscribeRequestMessage::Builder::CreateEventFilters()
+EventFilterIBs::Builder & SubscribeRequestMessage::Builder::CreateEventFilters()
{
if (mError == CHIP_NO_ERROR)
{
diff --git a/src/app/MessageDef/SubscribeRequestMessage.h b/src/app/MessageDef/SubscribeRequestMessage.h
index 924060e..b86ae5c 100644
--- a/src/app/MessageDef/SubscribeRequestMessage.h
+++ b/src/app/MessageDef/SubscribeRequestMessage.h
@@ -19,8 +19,8 @@
#include "AttributeDataVersionList.h"
#include "AttributePathIBs.h"
-#include "EventFilters.h"
-#include "EventPaths.h"
+#include "EventFilterIBs.h"
+#include "EventPathIBs.h"
#include "StructBuilder.h"
#include "StructParser.h"
#include <app/AppBuildConfig.h>
@@ -95,20 +95,20 @@
CHIP_ERROR GetAttributeRequests(AttributePathIBs::Parser * const apAttributeRequests) const;
/**
- * @brief Get a TLVReader for the EventPaths. Next() must be called before accessing them.
+ * @brief Get a TLVReader for the EventPathIBs. Next() must be called before accessing them.
*
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
- CHIP_ERROR GetEventRequests(EventPaths::Parser * const apEventRequests) const;
+ CHIP_ERROR GetEventRequests(EventPathIBs::Parser * const apEventRequests) const;
/**
- * @brief Get a TLVReader for the EventFilters. Next() must be called before accessing them.
+ * @brief Get a TLVReader for the EventFilterIBs. Next() must be called before accessing them.
*
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
- CHIP_ERROR GetEventFilters(EventFilters::Parser * const apEventFilters) const;
+ CHIP_ERROR GetEventFilters(EventFilterIBs::Parser * const apEventFilters) const;
/**
* @brief Get GetIsProxy boolean .
@@ -139,8 +139,8 @@
SubscribeRequestMessage::Builder & MinIntervalFloorSeconds(const uint16_t aMinIntervalFloorSeconds);
SubscribeRequestMessage::Builder & MaxIntervalCeilingSeconds(const uint16_t aMinIntervalFloorSeconds);
AttributePathIBs::Builder & CreateAttributeRequests();
- EventPaths::Builder & CreateEventRequests();
- EventFilters::Builder & CreateEventFilters();
+ EventPathIBs::Builder & CreateEventRequests();
+ EventFilterIBs::Builder & CreateEventFilters();
/**
* @brief This is set to true by the subscriber if it is a proxy-type device proxying for another client. This
@@ -162,8 +162,8 @@
private:
AttributePathIBs::Builder mAttributeRequests;
- EventPaths::Builder mEventRequests;
- EventFilters::Builder mEventFilters;
+ EventPathIBs::Builder mEventRequests;
+ EventFilterIBs::Builder mEventFilters;
};
} // namespace SubscribeRequestMessage
} // namespace app
diff --git a/src/app/MessageDef/SubscribeResponseMessage.h b/src/app/MessageDef/SubscribeResponseMessage.h
index 8484a67..83c5739 100644
--- a/src/app/MessageDef/SubscribeResponseMessage.h
+++ b/src/app/MessageDef/SubscribeResponseMessage.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include "EventPaths.h"
+#include "EventPathIBs.h"
#include "StructBuilder.h"
#include "StructParser.h"
#include <app/AppBuildConfig.h>
diff --git a/src/app/MessageDef/WriteResponseMessage.cpp b/src/app/MessageDef/WriteResponseMessage.cpp
index a616783..325a7a9 100644
--- a/src/app/MessageDef/WriteResponseMessage.cpp
+++ b/src/app/MessageDef/WriteResponseMessage.cpp
@@ -31,7 +31,7 @@
CHIP_ERROR err = CHIP_NO_ERROR;
int TagPresenceMask = 0;
TLV::TLVReader reader;
- AttributeStatuses::Parser writeResponses;
+ AttributeStatusIBs::Parser writeResponses;
PRETTY_PRINT("WriteResponseMessage =");
PRETTY_PRINT("{");
@@ -82,14 +82,14 @@
}
#endif // CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
-CHIP_ERROR WriteResponseMessage::Parser::GetWriteResponses(AttributeStatuses::Parser * const apWriteResponses) const
+CHIP_ERROR WriteResponseMessage::Parser::GetWriteResponses(AttributeStatusIBs::Parser * const apWriteResponses) const
{
TLV::TLVReader reader;
ReturnErrorOnFailure(mReader.FindElementWithTag(TLV::ContextTag(to_underlying(Tag::kWriteResponses)), reader));
return apWriteResponses->Init(reader);
}
-AttributeStatuses::Builder & WriteResponseMessage::Builder::CreateWriteResponses()
+AttributeStatusIBs::Builder & WriteResponseMessage::Builder::CreateWriteResponses()
{
// skip if error has already been set
if (mError == CHIP_NO_ERROR)
@@ -99,7 +99,7 @@
return mWriteResponses;
}
-AttributeStatuses::Builder & WriteResponseMessage::Builder::GetWriteResponses()
+AttributeStatusIBs::Builder & WriteResponseMessage::Builder::GetWriteResponses()
{
return mWriteResponses;
}
diff --git a/src/app/MessageDef/WriteResponseMessage.h b/src/app/MessageDef/WriteResponseMessage.h
index c777f2c..632180e 100644
--- a/src/app/MessageDef/WriteResponseMessage.h
+++ b/src/app/MessageDef/WriteResponseMessage.h
@@ -17,7 +17,7 @@
#pragma once
-#include "AttributeStatuses.h"
+#include "AttributeStatusIBs.h"
#include "StructBuilder.h"
#include "StructParser.h"
@@ -52,32 +52,32 @@
CHIP_ERROR CheckSchemaValidity() const;
/**
- * @brief Get a TLVReader for the AttributeStatuses. Next() must be called before accessing them.
+ * @brief Get a TLVReader for the AttributeStatusIBs. Next() must be called before accessing them.
*
* @param [in] apWriteResponses A pointer to apWriteResponses
*
* @return #CHIP_NO_ERROR on success
* #CHIP_END_OF_TLV if there is no such element
*/
- CHIP_ERROR GetWriteResponses(AttributeStatuses::Parser * const apWriteResponses) const;
+ CHIP_ERROR GetWriteResponses(AttributeStatusIBs::Parser * const apWriteResponses) const;
};
class Builder : public StructBuilder
{
public:
/**
- * @brief Initialize a AttributeStatuses::Builder for writing into the TLV stream
+ * @brief Initialize a AttributeStatusIBs::Builder for writing into the TLV stream
*
- * @return A reference to AttributeStatuses::Builder
+ * @return A reference to AttributeStatusIBs::Builder
*/
- AttributeStatuses::Builder & CreateWriteResponses();
+ AttributeStatusIBs::Builder & CreateWriteResponses();
/**
- * @brief Get reference to AttributeStatuses::Builder
+ * @brief Get reference to AttributeStatusIBs::Builder
*
- * @return A reference to AttributeStatuses::Builder
+ * @return A reference to AttributeStatusIBs::Builder
*/
- AttributeStatuses::Builder & GetWriteResponses();
+ AttributeStatusIBs::Builder & GetWriteResponses();
/**
* @brief Mark the end of this WriteResponseMessage
@@ -87,7 +87,7 @@
WriteResponseMessage::Builder & EndOfWriteResponseMessage();
private:
- AttributeStatuses::Builder mWriteResponses;
+ AttributeStatusIBs::Builder mWriteResponses;
};
} // namespace WriteResponseMessage
} // namespace app
diff --git a/src/app/ReadClient.cpp b/src/app/ReadClient.cpp
index 40c4095..52dd374 100644
--- a/src/app/ReadClient.cpp
+++ b/src/app/ReadClient.cpp
@@ -142,7 +142,7 @@
if (aReadPrepareParams.mEventPathParamsListSize != 0 && aReadPrepareParams.mpEventPathParamsList != nullptr)
{
- EventPaths::Builder & eventPathListBuilder = request.CreateEventRequests();
+ EventPathIBs::Builder & eventPathListBuilder = request.CreateEventRequests();
SuccessOrExit(err = eventPathListBuilder.GetError());
err = GenerateEventPaths(eventPathListBuilder, aReadPrepareParams.mpEventPathParamsList,
aReadPrepareParams.mEventPathParamsListSize);
@@ -150,7 +150,7 @@
if (aReadPrepareParams.mEventNumber != 0)
{
// EventFilter is optional
- EventFilters::Builder eventFilters = request.CreateEventFilters();
+ EventFilterIBs::Builder eventFilters = request.CreateEventFilters();
SuccessOrExit(err = request.GetError());
EventFilterIB::Builder eventFilter = eventFilters.CreateEventFilter();
eventFilter.EventMin(aReadPrepareParams.mEventNumber).EndOfEventFilterIB();
@@ -199,7 +199,7 @@
return err;
}
-CHIP_ERROR ReadClient::GenerateEventPaths(EventPaths::Builder & aEventPathsBuilder, EventPathParams * apEventPathParamsList,
+CHIP_ERROR ReadClient::GenerateEventPaths(EventPathIBs::Builder & aEventPathsBuilder, EventPathParams * apEventPathParamsList,
size_t aEventPathParamsListSize)
{
for (size_t index = 0; index < aEventPathParamsListSize; ++index)
@@ -219,7 +219,7 @@
for (size_t index = 0; index < aAttributePathParamsListSize; index++)
{
VerifyOrReturnError(apAttributePathParamsList[index].IsValidAttributePath(), CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH);
- ReturnErrorOnFailure(aAttributePathIBsBuilder.CreateAttributePath().Encode(apAttributePathParamsList[index]));
+ ReturnErrorOnFailure(aAttributePathIBsBuilder.CreatePath().Encode(apAttributePathParamsList[index]));
}
aAttributePathIBsBuilder.EndOfAttributePathIBs();
return aAttributePathIBsBuilder.GetError();
@@ -298,7 +298,7 @@
bool isAttributeReportIBsPresent = false;
bool suppressResponse = true;
uint64_t subscriptionId = 0;
- EventReports::Parser EventReports;
+ EventReportIBs::Parser eventReportIBs;
AttributeReportIBs::Parser attributeReportIBs;
System::PacketBufferTLVReader reader;
@@ -354,7 +354,7 @@
}
SuccessOrExit(err);
- err = report.GetEventReports(&EventReports);
+ err = report.GetEventReports(&eventReportIBs);
isEventReportsPresent = (err == CHIP_NO_ERROR);
if (err == CHIP_END_OF_TLV)
{
@@ -365,7 +365,7 @@
if (isEventReportsPresent && nullptr != mpCallback)
{
chip::TLV::TLVReader EventReportsReader;
- EventReports.GetReader(&EventReportsReader);
+ eventReportIBs.GetReader(&EventReportsReader);
err = ProcessEventReportIBs(EventReportsReader);
SuccessOrExit(err);
}
@@ -640,7 +640,7 @@
if (aReadPrepareParams.mEventPathParamsListSize != 0 && aReadPrepareParams.mpEventPathParamsList != nullptr)
{
- EventPaths::Builder & eventPathListBuilder = request.CreateEventRequests();
+ EventPathIBs::Builder & eventPathListBuilder = request.CreateEventRequests();
SuccessOrExit(err = eventPathListBuilder.GetError());
err = GenerateEventPaths(eventPathListBuilder, aReadPrepareParams.mpEventPathParamsList,
aReadPrepareParams.mEventPathParamsListSize);
@@ -649,7 +649,7 @@
if (aReadPrepareParams.mEventNumber != 0)
{
// EventNumber is optional
- EventFilters::Builder eventFilters = request.CreateEventFilters();
+ EventFilterIBs::Builder eventFilters = request.CreateEventFilters();
SuccessOrExit(err = request.GetError());
EventFilterIB::Builder eventFilter = eventFilters.CreateEventFilter();
eventFilter.EventMin(aReadPrepareParams.mEventNumber).EndOfEventFilterIB();
diff --git a/src/app/ReadClient.h b/src/app/ReadClient.h
index b7fb755..af36cf3 100644
--- a/src/app/ReadClient.h
+++ b/src/app/ReadClient.h
@@ -253,7 +253,7 @@
bool IsAwaitingInitialReport() const { return mState == ClientState::AwaitingInitialReport; }
bool IsAwaitingSubscribeResponse() const { return mState == ClientState::AwaitingSubscribeResponse; }
- CHIP_ERROR GenerateEventPaths(EventPaths::Builder & aEventPathsBuilder, EventPathParams * apEventPathParamsList,
+ CHIP_ERROR GenerateEventPaths(EventPathIBs::Builder & aEventPathsBuilder, EventPathParams * apEventPathParamsList,
size_t aEventPathParamsListSize);
CHIP_ERROR GenerateAttributePathList(AttributePathIBs::Builder & aAttributePathIBsBuilder,
AttributePathParams * apAttributePathParamsList, size_t aAttributePathParamsListSize);
diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp
index 5772ad1..6587d56 100644
--- a/src/app/ReadHandler.cpp
+++ b/src/app/ReadHandler.cpp
@@ -271,7 +271,7 @@
System::PacketBufferTLVReader reader;
ReadRequestMessage::Parser readRequestParser;
- EventPaths::Parser eventPathListParser;
+ EventPathIBs::Parser eventPathListParser;
AttributePathIBs::Parser attributePathListParser;
@@ -410,7 +410,7 @@
return err;
}
-CHIP_ERROR ReadHandler::ProcessEventPaths(EventPaths::Parser & aEventPathsParser)
+CHIP_ERROR ReadHandler::ProcessEventPaths(EventPathIBs::Parser & aEventPathsParser)
{
CHIP_ERROR err = CHIP_NO_ERROR;
TLV::TLVReader reader;
@@ -590,7 +590,7 @@
}
ReturnErrorOnFailure(err);
- EventPaths::Parser eventPathListParser;
+ EventPathIBs::Parser eventPathListParser;
err = subscribeRequestParser.GetEventRequests(&eventPathListParser);
if (err == CHIP_END_OF_TLV)
{
diff --git a/src/app/ReadHandler.h b/src/app/ReadHandler.h
index c020f73..6b640e4 100644
--- a/src/app/ReadHandler.h
+++ b/src/app/ReadHandler.h
@@ -170,7 +170,7 @@
CHIP_ERROR ProcessSubscribeRequest(System::PacketBufferHandle && aPayload);
CHIP_ERROR ProcessReadRequest(System::PacketBufferHandle && aPayload);
CHIP_ERROR ProcessAttributePathList(AttributePathIBs::Parser & aAttributePathListParser);
- CHIP_ERROR ProcessEventPaths(EventPaths::Parser & aEventPathsParser);
+ CHIP_ERROR ProcessEventPaths(EventPathIBs::Parser & aEventPathsParser);
CHIP_ERROR OnStatusResponse(Messaging::ExchangeContext * apExchangeContext, System::PacketBufferHandle && aPayload);
CHIP_ERROR OnMessageReceived(Messaging::ExchangeContext * apExchangeContext, const PayloadHeader & aPayloadHeader,
System::PacketBufferHandle && aPayload) override;
diff --git a/src/app/WriteClient.cpp b/src/app/WriteClient.cpp
index ab48f10..52842c5 100644
--- a/src/app/WriteClient.cpp
+++ b/src/app/WriteClient.cpp
@@ -93,7 +93,7 @@
System::PacketBufferTLVReader reader;
TLV::TLVReader attributeStatusesReader;
WriteResponseMessage::Parser writeResponse;
- AttributeStatuses::Parser attributeStatusesParser;
+ AttributeStatusIBs::Parser attributeStatusesParser;
reader.Init(std::move(payload));
err = reader.Next();
diff --git a/src/app/WriteHandler.cpp b/src/app/WriteHandler.cpp
index ff3ffcf..e1b5518 100644
--- a/src/app/WriteHandler.cpp
+++ b/src/app/WriteHandler.cpp
@@ -40,7 +40,7 @@
mMessageWriter.Init(std::move(packet));
ReturnLogErrorOnFailure(mWriteResponseBuilder.Init(&mMessageWriter));
- AttributeStatuses::Builder attributeStatusesBuilder = mWriteResponseBuilder.CreateWriteResponses();
+ AttributeStatusIBs::Builder attributeStatusesBuilder = mWriteResponseBuilder.CreateWriteResponses();
ReturnLogErrorOnFailure(attributeStatusesBuilder.GetError());
MoveToState(State::Initialized);
@@ -80,7 +80,7 @@
CHIP_ERROR WriteHandler::FinalizeMessage(System::PacketBufferHandle & packet)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- AttributeStatuses::Builder attributeStatuses;
+ AttributeStatusIBs::Builder attributeStatuses;
VerifyOrExit(mState == State::AddStatus, err = CHIP_ERROR_INCORRECT_STATE);
attributeStatuses = mWriteResponseBuilder.GetWriteResponses().EndOfAttributeStatuses();
err = attributeStatuses.GetError();
diff --git a/src/app/reporting/Engine.cpp b/src/app/reporting/Engine.cpp
index ed0a3f1..f1f6b05 100644
--- a/src/app/reporting/Engine.cpp
+++ b/src/app/reporting/Engine.cpp
@@ -220,7 +220,7 @@
ClusterInfo * clusterInfoList = apReadHandler->GetEventClusterInfolist();
EventNumber * eventNumberList = apReadHandler->GetVendedEventNumberList();
EventManagement & eventManager = EventManagement::GetInstance();
- EventReports::Builder EventReports;
+ EventReportIBs::Builder EventReportIBs;
bool hasMoreChunks = false;
aReportDataBuilder.Checkpoint(backup);
@@ -231,8 +231,8 @@
// skip the rest of processing
VerifyOrExit(eventManager.IsValid(), ChipLogError(DataManagement, "EventManagement has not yet initialized"));
- EventReports = aReportDataBuilder.CreateEventReports();
- SuccessOrExit(err = EventReports.GetError());
+ EventReportIBs = aReportDataBuilder.CreateEventReports();
+ SuccessOrExit(err = EventReportIBs.GetError());
memcpy(initialEvents, eventNumberList, sizeof(initialEvents));
@@ -256,7 +256,7 @@
while (apReadHandler->GetCurrentPriority() != PriorityLevel::Invalid)
{
uint8_t priorityIndex = static_cast<uint8_t>(apReadHandler->GetCurrentPriority());
- err = eventManager.FetchEventsSince(*(EventReports.GetWriter()), clusterInfoList, apReadHandler->GetCurrentPriority(),
+ err = eventManager.FetchEventsSince(*(EventReportIBs.GetWriter()), clusterInfoList, apReadHandler->GetCurrentPriority(),
eventNumberList[priorityIndex], eventCount);
if ((err == CHIP_END_OF_TLV) || (err == CHIP_ERROR_TLV_UNDERRUN) || (err == CHIP_NO_ERROR))
@@ -301,8 +301,8 @@
}
}
- EventReports.EndOfEventReports();
- SuccessOrExit(err = EventReports.GetError());
+ EventReportIBs.EndOfEventReports();
+ SuccessOrExit(err = EventReportIBs.GetError());
ChipLogDetail(DataManagement, "Fetched %zu events", eventCount);
diff --git a/src/app/tests/TestCommandInteraction.cpp b/src/app/tests/TestCommandInteraction.cpp
index 3842f1b..34a2705 100644
--- a/src/app/tests/TestCommandInteraction.cpp
+++ b/src/app/tests/TestCommandInteraction.cpp
@@ -286,7 +286,7 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
invokeResponseMessageBuilder.SuppressResponse(true);
- InvokeResponses::Builder invokeResponses = invokeResponseMessageBuilder.CreateInvokeResponses();
+ InvokeResponseIBs::Builder invokeResponses = invokeResponseMessageBuilder.CreateInvokeResponses();
NL_TEST_ASSERT(apSuite, invokeResponseMessageBuilder.GetError() == CHIP_NO_ERROR);
InvokeResponseIB::Builder invokeResponseIBBuilder = invokeResponses.CreateInvokeResponse();
diff --git a/src/app/tests/TestMessageDef.cpp b/src/app/tests/TestMessageDef.cpp
index e3781a9..db54741 100644
--- a/src/app/tests/TestMessageDef.cpp
+++ b/src/app/tests/TestMessageDef.cpp
@@ -23,7 +23,7 @@
*/
#include <app/AppBuildConfig.h>
-#include <app/MessageDef/EventFilters.h>
+#include <app/MessageDef/EventFilterIBs.h>
#include <app/MessageDef/EventStatusIB.h>
#include <app/MessageDef/InvokeRequestMessage.h>
#include <app/MessageDef/InvokeResponseMessage.h>
@@ -126,7 +126,7 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR && eventMin == 2);
}
-void BuildEventFilters(nlTestSuite * apSuite, EventFilters::Builder & aEventFiltersBuilder)
+void BuildEventFilters(nlTestSuite * apSuite, EventFilterIBs::Builder & aEventFiltersBuilder)
{
EventFilterIB::Builder eventFilterBuilder = aEventFiltersBuilder.CreateEventFilter();
NL_TEST_ASSERT(apSuite, aEventFiltersBuilder.GetError() == CHIP_NO_ERROR);
@@ -138,7 +138,7 @@
void ParseEventFilters(nlTestSuite * apSuite, chip::TLV::TLVReader & aReader)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- EventFilters::Parser eventFiltersParser;
+ EventFilterIBs::Parser eventFiltersParser;
err = eventFiltersParser.Init(aReader);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -201,7 +201,7 @@
void BuildAttributePathList(nlTestSuite * apSuite, AttributePathIBs::Builder & aAttributePathListBuilder)
{
- AttributePathIB::Builder attributePathBuilder = aAttributePathListBuilder.CreateAttributePath();
+ AttributePathIB::Builder attributePathBuilder = aAttributePathListBuilder.CreatePath();
NL_TEST_ASSERT(apSuite, attributePathBuilder.GetError() == CHIP_NO_ERROR);
BuildAttributePathIB(apSuite, attributePathBuilder);
@@ -261,7 +261,7 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR && isUrgent == true);
}
-void BuildEventPaths(nlTestSuite * apSuite, EventPaths::Builder & aEventPathsBuilder)
+void BuildEventPaths(nlTestSuite * apSuite, EventPathIBs::Builder & aEventPathsBuilder)
{
EventPathIB::Builder eventPathBuilder = aEventPathsBuilder.CreatePath();
NL_TEST_ASSERT(apSuite, eventPathBuilder.GetError() == CHIP_NO_ERROR);
@@ -274,7 +274,7 @@
void ParseEventPaths(nlTestSuite * apSuite, chip::TLV::TLVReader & aReader)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- EventPaths::Parser eventPathListParser;
+ EventPathIBs::Parser eventPathListParser;
err = eventPathListParser.Init(aReader);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -453,7 +453,7 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
}
-void BuildEventReports(nlTestSuite * apSuite, EventReports::Builder & aEventReportsBuilder)
+void BuildEventReports(nlTestSuite * apSuite, EventReportIBs::Builder & aEventReportsBuilder)
{
EventReportIB::Builder eventReportIBBuilder = aEventReportsBuilder.CreateEventReport();
NL_TEST_ASSERT(apSuite, aEventReportsBuilder.GetError() == CHIP_NO_ERROR);
@@ -466,7 +466,7 @@
void ParseEventReports(nlTestSuite * apSuite, chip::TLV::TLVReader & aReader)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- EventReports::Parser eventReportsParser;
+ EventReportIBs::Parser eventReportsParser;
err = eventReportsParser.Init(aReader);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -507,7 +507,7 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
}
-void BuildAttributeStatuses(nlTestSuite * apSuite, AttributeStatuses::Builder & aAttributeStatusesBuilder)
+void BuildAttributeStatuses(nlTestSuite * apSuite, AttributeStatusIBs::Builder & aAttributeStatusesBuilder)
{
AttributeStatusIB::Builder aAttributeStatusIBBuilder = aAttributeStatusesBuilder.CreateAttributeStatus();
NL_TEST_ASSERT(apSuite, aAttributeStatusesBuilder.GetError() == CHIP_NO_ERROR);
@@ -520,7 +520,7 @@
void ParseAttributeStatuses(nlTestSuite * apSuite, chip::TLV::TLVReader & aReader)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- AttributeStatuses::Parser attributeStatusParser;
+ AttributeStatusIBs::Parser attributeStatusParser;
err = attributeStatusParser.Init(aReader);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -864,7 +864,7 @@
#endif
}
-void BuildInvokeResponses(nlTestSuite * apSuite, InvokeResponses::Builder & aInvokeResponsesBuilder)
+void BuildInvokeResponses(nlTestSuite * apSuite, InvokeResponseIBs::Builder & aInvokeResponsesBuilder)
{
InvokeResponseIB::Builder invokeResponseIBBuilder = aInvokeResponsesBuilder.CreateInvokeResponse();
NL_TEST_ASSERT(apSuite, aInvokeResponsesBuilder.GetError() == CHIP_NO_ERROR);
@@ -877,7 +877,7 @@
void ParseInvokeResponses(nlTestSuite * apSuite, chip::TLV::TLVReader & aReader)
{
CHIP_ERROR err = CHIP_NO_ERROR;
- InvokeResponses::Parser invokeResponsesParser;
+ InvokeResponseIBs::Parser invokeResponsesParser;
err = invokeResponsesParser.Init(aReader);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -930,7 +930,7 @@
err = invokeResponseMessageBuilder.Init(&aWriter);
invokeResponseMessageBuilder.SuppressResponse(true);
- InvokeResponses::Builder invokeResponsesBuilder = invokeResponseMessageBuilder.CreateInvokeResponses();
+ InvokeResponseIBs::Builder invokeResponsesBuilder = invokeResponseMessageBuilder.CreateInvokeResponses();
NL_TEST_ASSERT(apSuite, invokeResponseMessageBuilder.GetError() == CHIP_NO_ERROR);
BuildInvokeResponses(apSuite, invokeResponsesBuilder);
@@ -970,9 +970,9 @@
NL_TEST_ASSERT(apSuite, reportDataMessageBuilder.GetError() == CHIP_NO_ERROR);
BuildAttributeReportIBs(apSuite, AttributeReportIBs);
- EventReports::Builder EventReports = reportDataMessageBuilder.CreateEventReports();
+ EventReportIBs::Builder EventReportIBs = reportDataMessageBuilder.CreateEventReports();
NL_TEST_ASSERT(apSuite, reportDataMessageBuilder.GetError() == CHIP_NO_ERROR);
- BuildEventReports(apSuite, EventReports);
+ BuildEventReports(apSuite, EventReportIBs);
reportDataMessageBuilder.MoreChunkedMessages(true);
NL_TEST_ASSERT(apSuite, reportDataMessageBuilder.GetError() == CHIP_NO_ERROR);
@@ -989,7 +989,7 @@
bool suppressResponse = false;
uint64_t subscriptionId = 0;
AttributeReportIBs::Parser attributeReportIBsParser;
- EventReports::Parser eventReportsParser;
+ EventReportIBs::Parser eventReportsParser;
bool moreChunkedMessages = false;
reportDataParser.Init(aReader);
@@ -1025,11 +1025,11 @@
NL_TEST_ASSERT(apSuite, readRequestBuilder.GetError() == CHIP_NO_ERROR);
BuildAttributePathList(apSuite, AttributePathIBs);
- EventPaths::Builder eventPathList = readRequestBuilder.CreateEventRequests();
+ EventPathIBs::Builder eventPathList = readRequestBuilder.CreateEventRequests();
NL_TEST_ASSERT(apSuite, readRequestBuilder.GetError() == CHIP_NO_ERROR);
BuildEventPaths(apSuite, eventPathList);
- EventFilters::Builder eventFilters = readRequestBuilder.CreateEventFilters();
+ EventFilterIBs::Builder eventFilters = readRequestBuilder.CreateEventFilters();
NL_TEST_ASSERT(apSuite, readRequestBuilder.GetError() == CHIP_NO_ERROR);
BuildEventFilters(apSuite, eventFilters);
@@ -1046,8 +1046,8 @@
ReadRequestMessage::Parser readRequestParser;
AttributePathIBs::Parser attributePathListParser;
- EventPaths::Parser eventPathListParser;
- EventFilters::Parser eventFiltersParser;
+ EventPathIBs::Parser eventPathListParser;
+ EventFilterIBs::Parser eventFiltersParser;
bool isFabricFiltered = false;
err = readRequestParser.Init(aReader);
@@ -1138,7 +1138,7 @@
err = writeResponseBuilder.Init(&aWriter);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
- AttributeStatuses::Builder attributeStatuses = writeResponseBuilder.CreateWriteResponses();
+ AttributeStatusIBs::Builder attributeStatuses = writeResponseBuilder.CreateWriteResponses();
NL_TEST_ASSERT(apSuite, writeResponseBuilder.GetError() == CHIP_NO_ERROR);
BuildAttributeStatuses(apSuite, attributeStatuses);
@@ -1151,7 +1151,7 @@
CHIP_ERROR err = CHIP_NO_ERROR;
WriteResponseMessage::Parser writeResponseParser;
- AttributeStatuses::Parser attributeStatusesParser;
+ AttributeStatusIBs::Parser attributeStatusesParser;
err = writeResponseParser.Init(aReader);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
#if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK
@@ -1174,11 +1174,11 @@
NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
BuildAttributePathList(apSuite, attributePathIBs);
- EventPaths::Builder eventPathList = subscribeRequestBuilder.CreateEventRequests();
+ EventPathIBs::Builder eventPathList = subscribeRequestBuilder.CreateEventRequests();
NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
BuildEventPaths(apSuite, eventPathList);
- EventFilters::Builder eventFilters = subscribeRequestBuilder.CreateEventFilters();
+ EventFilterIBs::Builder eventFilters = subscribeRequestBuilder.CreateEventFilters();
NL_TEST_ASSERT(apSuite, subscribeRequestBuilder.GetError() == CHIP_NO_ERROR);
BuildEventFilters(apSuite, eventFilters);
@@ -1207,8 +1207,8 @@
SubscribeRequestMessage::Parser subscribeRequestParser;
AttributePathIBs::Parser attributePathListParser;
- EventPaths::Parser eventPathListParser;
- EventFilters::Parser eventFiltersParser;
+ EventPathIBs::Parser eventPathListParser;
+ EventFilterIBs::Parser eventFiltersParser;
uint16_t MinIntervalFloorSeconds = 0;
uint16_t MaxIntervalCeilingSeconds = 0;
bool keepExistingSubscription = false;
@@ -1346,8 +1346,8 @@
CHIP_ERROR err = CHIP_NO_ERROR;
chip::System::PacketBufferTLVWriter writer;
chip::System::PacketBufferTLVReader reader;
- EventFilters::Builder eventFiltersBuilder;
- EventFilters::Parser eventFiltersParser;
+ EventFilterIBs::Builder eventFiltersBuilder;
+ EventFilterIBs::Parser eventFiltersParser;
writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
err = eventFiltersBuilder.Init(&writer);
@@ -1442,7 +1442,7 @@
CHIP_ERROR err = CHIP_NO_ERROR;
chip::System::PacketBufferTLVWriter writer;
chip::System::PacketBufferTLVReader reader;
- EventPaths::Builder eventPathListBuilder;
+ EventPathIBs::Builder eventPathListBuilder;
writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
@@ -1540,7 +1540,7 @@
CHIP_ERROR err = CHIP_NO_ERROR;
chip::System::PacketBufferTLVWriter writer;
chip::System::PacketBufferTLVReader reader;
- EventReports::Builder eventReportsBuilder;
+ EventReportIBs::Builder eventReportsBuilder;
writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
eventReportsBuilder.Init(&writer);
BuildEventReports(apSuite, eventReportsBuilder);
@@ -1679,7 +1679,7 @@
chip::System::PacketBufferTLVWriter writer;
chip::System::PacketBufferTLVReader reader;
writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
- AttributeStatuses::Builder attributeStatusesBuilder;
+ AttributeStatusIBs::Builder attributeStatusesBuilder;
err = attributeStatusesBuilder.Init(&writer);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
BuildAttributeStatuses(apSuite, attributeStatusesBuilder);
@@ -1907,7 +1907,7 @@
CHIP_ERROR err = CHIP_NO_ERROR;
chip::System::PacketBufferTLVWriter writer;
chip::System::PacketBufferTLVReader reader;
- InvokeResponses::Builder invokeResponsesBuilder;
+ InvokeResponseIBs::Builder invokeResponsesBuilder;
writer.Init(chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSize));
invokeResponsesBuilder.Init(&writer);
BuildInvokeResponses(apSuite, invokeResponsesBuilder);
diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp
index fe6b10e..3617cf0 100644
--- a/src/app/tests/TestReadInteraction.cpp
+++ b/src/app/tests/TestReadInteraction.cpp
@@ -411,7 +411,7 @@
AttributePathIBs::Builder attributePathListBuilder = readRequestBuilder.CreateAttributeRequests();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
- AttributePathIB::Builder attributePathBuilder = attributePathListBuilder.CreateAttributePath();
+ AttributePathIB::Builder attributePathBuilder = attributePathListBuilder.CreatePath();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
attributePathBuilder.Node(1).Endpoint(2).Cluster(3).Attribute(4).ListIndex(5).EndOfAttributePathIB();
@@ -540,7 +540,7 @@
AttributePathIBs::Builder attributePathListBuilder = readRequestBuilder.CreateAttributeRequests();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
- AttributePathIB::Builder attributePathBuilder = attributePathListBuilder.CreateAttributePath();
+ AttributePathIB::Builder attributePathBuilder = attributePathListBuilder.CreatePath();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
attributePathBuilder.Node(1).Endpoint(2).Cluster(3).ListIndex(5).EndOfAttributePathIB();
@@ -584,7 +584,7 @@
eventPathParams[0].mClusterId = 3;
eventPathParams[0].mEventId = 4;
- EventPaths::Builder & eventPathListBuilder = request.CreateEventRequests();
+ EventPathIBs::Builder & eventPathListBuilder = request.CreateEventRequests();
err = readClient.GenerateEventPaths(eventPathListBuilder, eventPathParams, 1 /*aEventPathParamsListSize*/);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -636,7 +636,7 @@
eventPathParams[1].mClusterId = 3;
eventPathParams[1].mEventId = 5;
- EventPaths::Builder & eventPathListBuilder = request.CreateEventRequests();
+ EventPathIBs::Builder & eventPathListBuilder = request.CreateEventRequests();
err = readClient.GenerateEventPaths(eventPathListBuilder, eventPathParams, 2 /*aEventPathParamsListSize*/);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
@@ -933,7 +933,7 @@
AttributePathIBs::Builder attributePathListBuilder = subscribeRequestBuilder.CreateAttributeRequests();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
- AttributePathIB::Builder attributePathBuilder = attributePathListBuilder.CreateAttributePath();
+ AttributePathIB::Builder attributePathBuilder = attributePathListBuilder.CreatePath();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
attributePathBuilder.Node(1).Endpoint(2).Cluster(3).Attribute(4).ListIndex(5).EndOfAttributePathIB();
diff --git a/src/app/tests/TestReportingEngine.cpp b/src/app/tests/TestReportingEngine.cpp
index c3776b5..1607042 100644
--- a/src/app/tests/TestReportingEngine.cpp
+++ b/src/app/tests/TestReportingEngine.cpp
@@ -87,7 +87,7 @@
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
attributePathListBuilder = readRequestBuilder.CreateAttributeRequests();
NL_TEST_ASSERT(apSuite, readRequestBuilder.GetError() == CHIP_NO_ERROR);
- attributePathBuilder = attributePathListBuilder.CreateAttributePath();
+ attributePathBuilder = attributePathListBuilder.CreatePath();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
attributePathBuilder = attributePathBuilder.Node(1)
.Endpoint(kTestEndpointId)
@@ -96,7 +96,7 @@
.EndOfAttributePathIB();
NL_TEST_ASSERT(apSuite, attributePathBuilder.GetError() == CHIP_NO_ERROR);
- attributePathBuilder = attributePathListBuilder.CreateAttributePath();
+ attributePathBuilder = attributePathListBuilder.CreatePath();
NL_TEST_ASSERT(apSuite, attributePathListBuilder.GetError() == CHIP_NO_ERROR);
attributePathBuilder = attributePathBuilder.Node(1)
.Endpoint(kTestEndpointId)
diff --git a/src/app/tests/TestWriteInteraction.cpp b/src/app/tests/TestWriteInteraction.cpp
index 5ac7c28..0596001 100644
--- a/src/app/tests/TestWriteInteraction.cpp
+++ b/src/app/tests/TestWriteInteraction.cpp
@@ -173,7 +173,7 @@
WriteResponseMessage::Builder writeResponseBuilder;
err = writeResponseBuilder.Init(&writer);
NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR);
- AttributeStatuses::Builder attributeStatusesBuilder = writeResponseBuilder.CreateWriteResponses();
+ AttributeStatusIBs::Builder attributeStatusesBuilder = writeResponseBuilder.CreateWriteResponses();
NL_TEST_ASSERT(apSuite, attributeStatusesBuilder.GetError() == CHIP_NO_ERROR);
AttributeStatusIB::Builder attributeStatusIBBuilder = attributeStatusesBuilder.CreateAttributeStatus();
NL_TEST_ASSERT(apSuite, attributeStatusIBBuilder.GetError() == CHIP_NO_ERROR);
