[cluster object] Change MatchesFabricIndex to GetFabricIndex (project…

…-chip#13902)

* [cluster object] Change MatchesFabricIndex to GetFabricIndex

* Run Codegen

* Fix comment

src/app/AttributeAccessInterface.h

@@ -106,7 +106,7 @@ class AttributeValueEncoder
             // If we are encoding for a fabric filtered attribute read and the fabric index does not match that present in the
             // request, skip encoding this list item.
             VerifyOrReturnError(!mAttributeValueEncoder.mIsFabricFiltered ||
-                                    aArg.MatchesFabricIndex(mAttributeValueEncoder.mAccessingFabricIndex),
+                                    aArg.GetFabricIndex() == mAttributeValueEncoder.mAccessingFabricIndex,
                                 CHIP_NO_ERROR);
             return mAttributeValueEncoder.EncodeListItem(std::forward<T>(aArg));
         }

src/app/data-model/FabricScoped.h

@@ -28,21 +28,21 @@ namespace DataModel {
 /*
  * Check whether a cluster object struct is fabric scoped.
  *   A fabric scoped struct contains a field of "FabricIndex" type, however, we cannot tell the difference between that field and
- * other uint8_t fields. Thus we add a MatchesFabricIndex member function for checking the fabric id. Here, IsFabricScoped check the
- * presence of MatchesFabricIndex function. This template can be used with std::enable_if.
+ * other uint8_t fields. Thus we add a GetFabricIndex member function for getting the fabric id. Here, IsFabricScoped checks the
+ * presence of GetFabricIndex function. This template can be used with std::enable_if.
  */
 template <typename T>
 class IsFabricScoped
 {
 private:
     template <typename Tp>
-    static auto TestHasMatchesFabricIndex(int) -> TemplatedTrueType<decltype(&Tp::MatchesFabricIndex)>;
+    static auto TestHasFabricIndex(int) -> TemplatedTrueType<decltype(&Tp::GetFabricIndex)>;
 
     template <typename Tp>
-    static auto TestHasMatchesFabricIndex(long) -> std::false_type;
+    static auto TestHasFabricIndex(long) -> std::false_type;
 
 public:
-    static constexpr bool value = decltype(TestHasMatchesFabricIndex<std::decay_t<T>>(0))::value;
+    static constexpr bool value = decltype(TestHasFabricIndex<std::decay_t<T>>(0))::value;
 };
 
 } // namespace DataModel

src/app/zap-templates/partials/cluster-objects-struct.zapt

@@ -17,8 +17,8 @@ namespace {{asUpperCamelCase name}} {
         CHIP_ERROR Decode(TLV::TLVReader &reader);
         {{/unless}}
         {{#if struct_is_fabric_scoped}}
-        bool MatchesFabricIndex(FabricIndex fabricIndex_) const {
-            return {{ asLowerCamelCase struct_fabric_idx_field }} == fabricIndex_;
+        auto GetFabricIndex() const {
+            return {{ asLowerCamelCase struct_fabric_idx_field }};
         }
         {{/if}}
     };
@@ -74,4 +74,4 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader &reader) {
 }
 
 } // namespace {{asUpperCamelCase name}}
-{{/if}}
+{{/if}}