Restyled by clang-format

project-chip · Feb 8, 2022 · b286cdd · b286cdd
1 parent f321b98
commit b286cdd
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -60,12 +60,12 @@ void AndroidDeviceControllerWrapper::CallJavaMethod(const char * methodName, jin
                                              argument);
 }
 
-AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(
-    JavaVM * vm, jobject deviceControllerObj, chip::NodeId nodeId, chip::System::Layer * systemLayer,
-    chip::Inet::EndPointManager<Inet::TCPEndPoint> * tcpEndPointManager,
-    chip::Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPointManager,
-    AndroidOperationalCredentialsIssuerPtr opCredsIssuerPtr,
-    CHIP_ERROR * errInfoOnFailure)
+AndroidDeviceControllerWrapper *
+AndroidDeviceControllerWrapper::AllocateNew(JavaVM * vm, jobject deviceControllerObj, chip::NodeId nodeId,
+                                            chip::System::Layer * systemLayer,
+                                            chip::Inet::EndPointManager<Inet::TCPEndPoint> * tcpEndPointManager,
+                                            chip::Inet::EndPointManager<Inet::UDPEndPoint> * udpEndPointManager,
+                                            AndroidOperationalCredentialsIssuerPtr opCredsIssuerPtr, CHIP_ERROR * errInfoOnFailure)
 {
     if (errInfoOnFailure == nullptr)
     {
@@ -100,11 +100,12 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(
         *errInfoOnFailure = CHIP_ERROR_NO_MEMORY;
         return nullptr;
     }
-    std::unique_ptr<AndroidDeviceControllerWrapper> wrapper(new AndroidDeviceControllerWrapper(std::move(controller), std::move(opCredsIssuerPtr)));
+    std::unique_ptr<AndroidDeviceControllerWrapper> wrapper(
+        new AndroidDeviceControllerWrapper(std::move(controller), std::move(opCredsIssuerPtr)));
 
     wrapper->SetJavaObjectRef(vm, deviceControllerObj);
 
-    chip::Controller::AndroidOperationalCredentialsIssuer* opCredsIssuer = wrapper->mOpCredsIssuer.get();
+    chip::Controller::AndroidOperationalCredentialsIssuer * opCredsIssuer = wrapper->mOpCredsIssuer.get();
 
     // Initialize device attestation verifier
     // TODO: Replace testingRootStore with a AttestationTrustStore that has the necessary official PAA roots available
@@ -161,7 +162,8 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(
         return nullptr;
     }
 
-    *errInfoOnFailure = opCredsIssuer->GenerateNOCChainAfterValidation(nodeId, 0, ephemeralKey.Pubkey(), rcacSpan, icacSpan, nocSpan);
+    *errInfoOnFailure =
+        opCredsIssuer->GenerateNOCChainAfterValidation(nodeId, 0, ephemeralKey.Pubkey(), rcacSpan, icacSpan, nocSpan);
     if (*errInfoOnFailure != CHIP_NO_ERROR)
     {
         return nullptr;

diff --git a/src/controller/java/AndroidDeviceControllerWrapper.h b/src/controller/java/AndroidDeviceControllerWrapper.h
@@ -102,7 +102,9 @@ class AndroidDeviceControllerWrapper : public chip::Controller::DevicePairingDel
     jbyteArray operationalDatasetBytes = nullptr;
     jbyte * operationalDataset         = nullptr;
 
-    AndroidDeviceControllerWrapper(ChipDeviceControllerPtr controller, AndroidOperationalCredentialsIssuerPtr opCredsIssuer) : mController(std::move(controller)), mOpCredsIssuer(std::move(opCredsIssuer)) { }
+    AndroidDeviceControllerWrapper(ChipDeviceControllerPtr controller, AndroidOperationalCredentialsIssuerPtr opCredsIssuer) :
+        mController(std::move(controller)), mOpCredsIssuer(std::move(opCredsIssuer))
+    {}
 };
 
 inline jlong AndroidDeviceControllerWrapper::ToJNIHandle()

diff --git a/src/controller/java/AndroidOperationalCredentialsIssuer.cpp b/src/controller/java/AndroidOperationalCredentialsIssuer.cpp
@@ -16,8 +16,8 @@
  *    limitations under the License.
  */
 
-#include <algorithm>
 #include "AndroidOperationalCredentialsIssuer.h"
+#include <algorithm>
 #include <credentials/CHIPCert.h>
 #include <lib/core/CHIPTLV.h>
 #include <lib/support/CHIPMem.h>
@@ -68,7 +68,7 @@ CHIP_ERROR AndroidOperationalCredentialsIssuer::Initialize(PersistentStorageDele
         ReturnErrorOnFailure(mIssuer.Deserialize(serializedKey));
     }
 
-    mStorage     = &storage;
+    mStorage       = &storage;
     mJavaObjectRef = javaObjectRef;
 
     mInitialized = true;
@@ -185,6 +185,5 @@ CHIP_ERROR AndroidOperationalCredentialsIssuer::GenerateNOCChain(const ByteSpan
     return CHIP_NO_ERROR;
 }
 
-
 } // namespace Controller
 } // namespace chip
diff --git a/src/controller/java/AndroidOperationalCredentialsIssuer.h b/src/controller/java/AndroidOperationalCredentialsIssuer.h
@@ -88,9 +88,9 @@ class DLL_EXPORT AndroidOperationalCredentialsIssuer : public OperationalCredent
 
 private:
     Crypto::P256Keypair mIssuer;
-    bool mInitialized              = false;
-    uint32_t mIssuerId             = 0;
-    uint32_t mNow                  = 0;
+    bool mInitialized  = false;
+    uint32_t mIssuerId = 0;
+    uint32_t mNow      = 0;
 
     // By default, let's set validity to 10 years
     uint32_t mValidity = 365 * 24 * 60 * 60 * 10;

diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp
@@ -154,10 +154,11 @@ JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self)
     long result                              = 0;
 
     ChipLogProgress(Controller, "newDeviceController() called");
-    std::unique_ptr<chip::Controller::AndroidOperationalCredentialsIssuer> opCredsIssuer(new chip::Controller::AndroidOperationalCredentialsIssuer());
-    wrapper =
-        AndroidDeviceControllerWrapper::AllocateNew(sJVM, self, kLocalDeviceId, &DeviceLayer::SystemLayer(),
-                                                    DeviceLayer::TCPEndPointManager(), DeviceLayer::UDPEndPointManager(), std::move(opCredsIssuer), &err);
+    std::unique_ptr<chip::Controller::AndroidOperationalCredentialsIssuer> opCredsIssuer(
+        new chip::Controller::AndroidOperationalCredentialsIssuer());
+    wrapper = AndroidDeviceControllerWrapper::AllocateNew(sJVM, self, kLocalDeviceId, &DeviceLayer::SystemLayer(),
+                                                          DeviceLayer::TCPEndPointManager(), DeviceLayer::UDPEndPointManager(),
+                                                          std::move(opCredsIssuer), &err);
     SuccessOrExit(err);
 
     // Create and start the IO thread. Must be called after Controller()->Init