Fixing style issues

pgregorr-amazon · pgregorr-amazon · commit e1d72de5292c · 2024-05-03T16:55:36.000-07:00
diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterCastingPlayer-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/core/MatterCastingPlayer-JNI.cpp
@@ -83,7 +83,9 @@ JNI_METHOD(jobject, verifyOrEstablishConnection)
         CHIP_ERROR result = idOptions.addTargetAppInfo(targetAppInfo);
         if (result != CHIP_NO_ERROR)
         {
-            ChipLogError(AppServer, "MatterCastingPlayer-JNI::verifyOrEstablishConnection() failed to add targetAppInfo: %" CHIP_ERROR_FORMAT, result.Format());
+            ChipLogError(AppServer,
+                         "MatterCastingPlayer-JNI::verifyOrEstablishConnection() failed to add targetAppInfo: %" CHIP_ERROR_FORMAT,
+                         result.Format());
         }
     }
 
diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingPlayer.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/MCCastingPlayer.mm
@@ -62,8 +62,7 @@ - (void)verifyOrEstablishConnectionWithCompletionBlock:(void (^_Nonnull)(NSError
             targetAppInfo.productId = desiredEndpointFilter.productId;
 
             CHIP_ERROR result = idOptions.addTargetAppInfo(targetAppInfo);
-            if (result != CHIP_NO_ERROR)
-            {
+            if (result != CHIP_NO_ERROR) {
                 ChipLogError(AppServer, "MCCastingPlayer.verifyOrEstablishConnectionWithCompletionBlock failed to add targetAppInfo: %" CHIP_ERROR_FORMAT, result.Format());
             }
         }
diff --git a/examples/tv-casting-app/linux/simple-app-helper.cpp b/examples/tv-casting-app/linux/simple-app-helper.cpp
@@ -252,20 +252,28 @@ CHIP_ERROR CommandHandler(int argc, char ** argv)
         {
             if (strcmp(argv[2], "cgp") == 0)
             {
-                // Attempt Commissioner-Generated Passcode (cgp) commissioning flow only if the CastingPlayer indicates support for it.
+                // Attempt Commissioner-Generated Passcode (cgp) commissioning flow only if the CastingPlayer indicates support for
+                // it.
                 if (targetCastingPlayer->GetSupportsCommissionerGeneratedPasscode())
                 {
-                    ChipLogProgress(AppServer, "CommandHandler() request %lu cgp. Attempting the Commissioner-Generated Passcode commissioning flow", index);
+                    ChipLogProgress(
+                        AppServer,
+                        "CommandHandler() request %lu cgp. Attempting the Commissioner-Generated Passcode commissioning flow",
+                        index);
                     idOptions.mCommissionerPasscode = true;
-                } else 
+                }
+                else
                 {
-                    ChipLogError(AppServer, "CommandHandler() request %lu cgp. Selected CastingPLayer does not support the Commissioner-Generated Passcode commissioning flow", index);
+                    ChipLogError(AppServer,
+                                 "CommandHandler() request %lu cgp. Selected CastingPLayer does not support the "
+                                 "Commissioner-Generated Passcode commissioning flow",
+                                 index);
                 }
             }
         }
         chip::Protocols::UserDirectedCommissioning::TargetAppInfo targetAppInfo;
         targetAppInfo.vendorId = kDesiredEndpointVendorId;
-        CHIP_ERROR result = idOptions.addTargetAppInfo(targetAppInfo);
+        CHIP_ERROR result      = idOptions.addTargetAppInfo(targetAppInfo);
         if (result != CHIP_NO_ERROR)
         {
             ChipLogError(AppServer, "CommandHandler() request, failed to add targetAppInfo: %" CHIP_ERROR_FORMAT, result.Format());
@@ -308,8 +316,9 @@ CHIP_ERROR PrintAllCommands()
     streamer_printf(sout, "  stop-discovery       Stop Discovery of Casting Players. Usage: cast stop-discovery\r\n");
     streamer_printf(
         sout, "  request <index>      Request connecting to discovered Casting Player with [index]. Usage: cast request 0\r\n");
-    streamer_printf(
-        sout, "  request <index> cgp  Request connecting to discovered Casting Player with [index] using the Commissioner-Generated Passcode commissioning flow. Usage: cast request 0 cgp\r\n");
+    streamer_printf(sout,
+                    "  request <index> cgp  Request connecting to discovered Casting Player with [index] using the "
+                    "Commissioner-Generated Passcode commissioning flow. Usage: cast request 0 cgp\r\n");
     streamer_printf(sout, "\r\n");
 
     return CHIP_NO_ERROR;
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.cpp
@@ -254,7 +254,9 @@ void CastingPlayer::FindOrEstablishSession(void * clientContext, chip::OnDeviceC
         connectionContext->mOnConnectionFailureCallback);
 }
 
-bool CastingPlayer::ContainsDesiredTargetApp(core::CastingPlayer * cachedCastingPlayer, std::vector<chip::Protocols::UserDirectedCommissioning::TargetAppInfo> desiredTargetApps)
+bool CastingPlayer::ContainsDesiredTargetApp(
+    core::CastingPlayer * cachedCastingPlayer,
+    std::vector<chip::Protocols::UserDirectedCommissioning::TargetAppInfo> desiredTargetApps)
 {
     std::vector<memory::Strong<Endpoint>> cachedEndpoints = cachedCastingPlayer->GetEndpoints();
     for (size_t i = 0; i < desiredTargetApps.size(); i++)
diff --git a/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h b/examples/tv-casting-app/tv-casting-common/core/CastingPlayer.h
@@ -95,14 +95,8 @@ using ConnectCallback = std::function<void(CHIP_ERROR, CastingPlayer *)>;
 class CastingPlayer : public std::enable_shared_from_this<CastingPlayer>
 {
 public:
-    CastingPlayer(CastingPlayerAttributes playerAttributes)
-    {
-        mAttributes                     = playerAttributes;
-    }
-    ~CastingPlayer()
-    {
-        delete mCommissionerDeclarationHandler;
-    }
+    CastingPlayer(CastingPlayerAttributes playerAttributes) { mAttributes = playerAttributes; }
+    ~CastingPlayer() { delete mCommissionerDeclarationHandler; }
 
     /**
      * @brief Get the CastingPlayer object targeted currently (may not be connected)
@@ -217,7 +211,7 @@ class CastingPlayer : public std::enable_shared_from_this<CastingPlayer>
      * Flag to indicate whether or not the Commissionee has obtained the Commissioner Passcode from the user and is therefore ready
      * for commissioning.
      */
-    bool mUdcCommissionerPasscodeReady = false;
+    bool mUdcCommissionerPasscodeReady                               = false;
     CommissionerDeclarationHandler * mCommissionerDeclarationHandler = new CommissionerDeclarationHandler();
     static CastingPlayer * mTargetCastingPlayer;
     unsigned long long int mCommissioningWindowTimeoutSec = kCommissioningWindowTimeoutSec;
@@ -245,9 +239,11 @@ class CastingPlayer : public std::enable_shared_from_this<CastingPlayer>
 
     /**
      * @brief Checks if the cachedCastingPlayer contains at least one Endpoint/TargetApp described in the desiredTargetApps list.
-     * @return true - cachedCastingPlayer contains at least one endpoints with matching (non-default) values for vendorID and productID as described in the desiredTargetApps list, false otherwise.
+     * @return true - cachedCastingPlayer contains at least one endpoints with matching (non-default) values for vendorID and
+     * productID as described in the desiredTargetApps list, false otherwise.
      */
-    bool ContainsDesiredTargetApp(core::CastingPlayer * cachedCastingPlayer, std::vector<chip::Protocols::UserDirectedCommissioning::TargetAppInfo> desiredTargetApps);
+    bool ContainsDesiredTargetApp(core::CastingPlayer * cachedCastingPlayer,
+                                  std::vector<chip::Protocols::UserDirectedCommissioning::TargetAppInfo> desiredTargetApps);
 
     // ChipDeviceEventHandler handles chip::DeviceLayer::ChipDeviceEvent events and helps the CastingPlayer class commission with
     // and connect to a CastingPlayer
diff --git a/examples/tv-casting-app/tv-casting-common/core/IdentificationDeclarationOptions.h b/examples/tv-casting-app/tv-casting-common/core/IdentificationDeclarationOptions.h
@@ -61,10 +61,13 @@ class IdentificationDeclarationOptions
      */
     bool mCancelPasscode = false;
 
-    CHIP_ERROR addTargetAppInfo(const chip::Protocols::UserDirectedCommissioning::TargetAppInfo& targetAppInfo) {
+    CHIP_ERROR addTargetAppInfo(const chip::Protocols::UserDirectedCommissioning::TargetAppInfo & targetAppInfo)
+    {
         if (mTargetAppInfos.size() >= kMaxTargetAppInfos)
         {
-            ChipLogError(AppServer, "IdentificationDeclarationOptions::addTargetAppInfo() failed to add TargetAppInfo, max vector size is %zu", kMaxTargetAppInfos);
+            ChipLogError(AppServer,
+                         "IdentificationDeclarationOptions::addTargetAppInfo() failed to add TargetAppInfo, max vector size is %zu",
+                         kMaxTargetAppInfos);
             return CHIP_ERROR_NO_MEMORY;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,9 @@ JNI_METHOD(jobject, verifyOrEstablishConnection)`
`83`	`83`	`CHIP_ERROR result = idOptions.addTargetAppInfo(targetAppInfo);`
`84`	`84`	`if (result != CHIP_NO_ERROR)`
`85`	`85`	`{`
`86`		`- ChipLogError(AppServer, "MatterCastingPlayer-JNI::verifyOrEstablishConnection() failed to add targetAppInfo: %" CHIP_ERROR_FORMAT, result.Format());`
	`86`	`+ ChipLogError(AppServer,`
	`87`	`+ "MatterCastingPlayer-JNI::verifyOrEstablishConnection() failed to add targetAppInfo: %" CHIP_ERROR_FORMAT,`
	`88`	`+ result.Format());`
`87`	`89`	`}`
`88`	`90`	`}`
`89`	`91`
Original file line number	Diff line number	Diff line change
`@@ -62,8 +62,7 @@ - (void)verifyOrEstablishConnectionWithCompletionBlock:(void (^_Nonnull)(NSError`
`62`	`62`	`targetAppInfo.productId = desiredEndpointFilter.productId;`
`63`	`63`
`64`	`64`	`CHIP_ERROR result = idOptions.addTargetAppInfo(targetAppInfo);`
`65`		`- if (result != CHIP_NO_ERROR)`
`66`		`- {`
	`65`	`+ if (result != CHIP_NO_ERROR) {`
`67`	`66`	`ChipLogError(AppServer, "MCCastingPlayer.verifyOrEstablishConnectionWithCompletionBlock failed to add targetAppInfo: %" CHIP_ERROR_FORMAT, result.Format());`
`68`	`67`	`}`
`69`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,20 +252,28 @@ CHIP_ERROR CommandHandler(int argc, char ** argv)`
`252`	`252`	`{`
`253`	`253`	`if (strcmp(argv[2], "cgp") == 0)`
`254`	`254`	`{`
`255`		`- // Attempt Commissioner-Generated Passcode (cgp) commissioning flow only if the CastingPlayer indicates support for it.`
	`255`	`+ // Attempt Commissioner-Generated Passcode (cgp) commissioning flow only if the CastingPlayer indicates support for`
	`256`	`+ // it.`
`256`	`257`	`if (targetCastingPlayer->GetSupportsCommissionerGeneratedPasscode())`
`257`	`258`	`{`
`258`		`- ChipLogProgress(AppServer, "CommandHandler() request %lu cgp. Attempting the Commissioner-Generated Passcode commissioning flow", index);`
	`259`	`+ ChipLogProgress(`
	`260`	`+ AppServer,`
	`261`	`+ "CommandHandler() request %lu cgp. Attempting the Commissioner-Generated Passcode commissioning flow",`
	`262`	`+ index);`
`259`	`263`	`idOptions.mCommissionerPasscode = true;`
`260`		`- } else`
	`264`	`+ }`
	`265`	`+ else`
`261`	`266`	`{`
`262`		`- ChipLogError(AppServer, "CommandHandler() request %lu cgp. Selected CastingPLayer does not support the Commissioner-Generated Passcode commissioning flow", index);`
	`267`	`+ ChipLogError(AppServer,`
	`268`	`+ "CommandHandler() request %lu cgp. Selected CastingPLayer does not support the "`
	`269`	`+ "Commissioner-Generated Passcode commissioning flow",`
	`270`	`+ index);`
`263`	`271`	`}`
`264`	`272`	`}`
`265`	`273`	`}`
`266`	`274`	`chip::Protocols::UserDirectedCommissioning::TargetAppInfo targetAppInfo;`
`267`	`275`	`targetAppInfo.vendorId = kDesiredEndpointVendorId;`
`268`		`- CHIP_ERROR result = idOptions.addTargetAppInfo(targetAppInfo);`
	`276`	`+ CHIP_ERROR result = idOptions.addTargetAppInfo(targetAppInfo);`
`269`	`277`	`if (result != CHIP_NO_ERROR)`
`270`	`278`	`{`
`271`	`279`	`ChipLogError(AppServer, "CommandHandler() request, failed to add targetAppInfo: %" CHIP_ERROR_FORMAT, result.Format());`
`@@ -308,8 +316,9 @@ CHIP_ERROR PrintAllCommands()`
`308`	`316`	`streamer_printf(sout, " stop-discovery Stop Discovery of Casting Players. Usage: cast stop-discovery\r\n");`
`309`	`317`	`streamer_printf(`
`310`	`318`	`sout, " request <index> Request connecting to discovered Casting Player with [index]. Usage: cast request 0\r\n");`
`311`		`- streamer_printf(`
`312`		`- sout, " request <index> cgp Request connecting to discovered Casting Player with [index] using the Commissioner-Generated Passcode commissioning flow. Usage: cast request 0 cgp\r\n");`
	`319`	`+ streamer_printf(sout,`
	`320`	`+ " request <index> cgp Request connecting to discovered Casting Player with [index] using the "`
	`321`	`+ "Commissioner-Generated Passcode commissioning flow. Usage: cast request 0 cgp\r\n");`
`313`	`322`	`streamer_printf(sout, "\r\n");`
`314`	`323`
`315`	`324`	`return CHIP_NO_ERROR;`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,9 @@ void CastingPlayer::FindOrEstablishSession(void * clientContext, chip::OnDeviceC`
`254`	`254`	`connectionContext->mOnConnectionFailureCallback);`
`255`	`255`	`}`
`256`	`256`
`257`		`-bool CastingPlayer::ContainsDesiredTargetApp(core::CastingPlayer * cachedCastingPlayer, std::vector<chip::Protocols::UserDirectedCommissioning::TargetAppInfo> desiredTargetApps)`
	`257`	`+bool CastingPlayer::ContainsDesiredTargetApp(`
	`258`	`+ core::CastingPlayer * cachedCastingPlayer,`
	`259`	`+ std::vector<chip::Protocols::UserDirectedCommissioning::TargetAppInfo> desiredTargetApps)`
`258`	`260`	`{`
`259`	`261`	`std::vector<memory::Strong<Endpoint>> cachedEndpoints = cachedCastingPlayer->GetEndpoints();`
`260`	`262`	`for (size_t i = 0; i < desiredTargetApps.size(); i++)`
Original file line number	Diff line number	Diff line change
`@@ -61,10 +61,13 @@ class IdentificationDeclarationOptions`
`61`	`61`	`*/`
`62`	`62`	`bool mCancelPasscode = false;`
`63`	`63`
`64`		`- CHIP_ERROR addTargetAppInfo(const chip::Protocols::UserDirectedCommissioning::TargetAppInfo& targetAppInfo) {`
	`64`	`+ CHIP_ERROR addTargetAppInfo(const chip::Protocols::UserDirectedCommissioning::TargetAppInfo & targetAppInfo)`
	`65`	`+ {`
`65`	`66`	`if (mTargetAppInfos.size() >= kMaxTargetAppInfos)`
`66`	`67`	`{`
`67`		`- ChipLogError(AppServer, "IdentificationDeclarationOptions::addTargetAppInfo() failed to add TargetAppInfo, max vector size is %zu", kMaxTargetAppInfos);`
	`68`	`+ ChipLogError(AppServer,`
	`69`	`+ "IdentificationDeclarationOptions::addTargetAppInfo() failed to add TargetAppInfo, max vector size is %zu",`
	`70`	`+ kMaxTargetAppInfos);`
`68`	`71`	`return CHIP_ERROR_NO_MEMORY;`
`69`	`72`	`}`
`70`	`73`