Apply code review suggestions

Author: gmarcosb

src/app/data-model/Decode.h

@@ -114,6 +114,7 @@ CHIP_ERROR Decode(TLV::TLVReader & reader, X & x)
     return x.Decode(reader);
 }
 
+
 /*
  * @brief
  *
@@ -127,8 +128,7 @@ CHIP_ERROR Decode(TLV::TLVReader & reader, X & x)
 template <typename X,
           typename std::enable_if_t<
               std::is_class<X>::value &&
-                  std::is_same<decltype(std::declval<X>().Decode(std::declval<TLV::TLVReader &>(), std::declval<FabricIndex>())),
-                               CHIP_ERROR>::value,
+                  std::is_same<decltype(std::declval<X>().Decode(std::declval<TLV::TLVReader &>(), std::declval<FabricIndex>())), CHIP_ERROR>::value,
               X> * = nullptr>
 CHIP_ERROR Decode(TLV::TLVReader & reader, X & x, FabricIndex aAccessingFabricIndex)
 {

src/app/zap-templates/templates/app/im-cluster-command-handler.zapt

@@ -37,7 +37,11 @@ Protocols::InteractionModel::Status DispatchServerCommand(CommandHandler * apCom
     {{/first}}
         case Commands::{{asUpperCamelCase commandName}}::Id: {
             Commands::{{asUpperCamelCase commandName}}::DecodableType commandData;
+            {{#if isFabricScoped~}}
             TLVError = DataModel::Decode(aDataTlv, commandData, apCommandObj->GetAccessingFabricIndex());
+            {{else}}
+            TLVError = DataModel::Decode(aDataTlv, commandData);
+            {{/if}}
             if (TLVError == CHIP_NO_ERROR)
             {
                 wasHandled = emberAf{{asUpperCamelCase parent.clusterName}}Cluster{{asUpperCamelCase commandName}}Callback(apCommandObj, aCommandPath, commandData);