NamedShadow import (#123)

* NamedShadow import

* clang-format

Author: Justin Boswell

aws-common-runtime/aws-crt-cpp

@@ -36,9 +36,9 @@ namespace Aws
             void SerializeToObject(Crt::JsonObject &doc) const;
 
             Aws::Crt::Optional<Aws::Crt::String> CertificateId;
-            Aws::Crt::Optional<Aws::Crt::String> PrivateKey;
             Aws::Crt::Optional<Aws::Crt::String> CertificateOwnershipToken;
             Aws::Crt::Optional<Aws::Crt::String> CertificatePem;
+            Aws::Crt::Optional<Aws::Crt::String> PrivateKey;
 
           private:
             static void LoadFromObject(CreateKeysAndCertificateResponse &obj, const Crt::JsonView &doc);

identity/include/aws/iotidentity/CreateKeysAndCertificateResponse.h

@@ -35,9 +35,9 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<Aws::Crt::String> ErrorCode;
             Aws::Crt::Optional<int32_t> StatusCode;
             Aws::Crt::Optional<Aws::Crt::String> ErrorMessage;
+            Aws::Crt::Optional<Aws::Crt::String> ErrorCode;
 
           private:
             static void LoadFromObject(ErrorResponse &obj, const Crt::JsonView &doc);

identity/include/aws/iotidentity/ErrorResponse.h

@@ -35,8 +35,8 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> Parameters;
             Aws::Crt::Optional<Aws::Crt::String> TemplateName;
+            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> Parameters;
             Aws::Crt::Optional<Aws::Crt::String> CertificateOwnershipToken;
 
           private:

identity/include/aws/iotidentity/RegisterThingRequest.h

@@ -35,8 +35,8 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> DeviceConfiguration;
             Aws::Crt::Optional<Aws::Crt::String> ThingName;
+            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> DeviceConfiguration;
 
           private:
             static void LoadFromObject(RegisterThingResponse &obj, const Crt::JsonView &doc);

identity/include/aws/iotidentity/RegisterThingResponse.h

@@ -32,11 +32,6 @@ namespace Aws
                 val.CertificateId = doc.GetString("certificateId");
             }
 
-            if (doc.ValueExists("privateKey"))
-            {
-                val.PrivateKey = doc.GetString("privateKey");
-            }
-
             if (doc.ValueExists("certificateOwnershipToken"))
             {
                 val.CertificateOwnershipToken = doc.GetString("certificateOwnershipToken");
@@ -46,6 +41,11 @@ namespace Aws
             {
                 val.CertificatePem = doc.GetString("certificatePem");
             }
+
+            if (doc.ValueExists("privateKey"))
+            {
+                val.PrivateKey = doc.GetString("privateKey");
+            }
         }
 
         void CreateKeysAndCertificateResponse::SerializeToObject(Aws::Crt::JsonObject &object) const
@@ -57,11 +57,6 @@ namespace Aws
                 object.WithString("certificateId", *CertificateId);
             }
 
-            if (PrivateKey)
-            {
-                object.WithString("privateKey", *PrivateKey);
-            }
-
             if (CertificateOwnershipToken)
             {
                 object.WithString("certificateOwnershipToken", *CertificateOwnershipToken);
@@ -71,6 +66,11 @@ namespace Aws
             {
                 object.WithString("certificatePem", *CertificatePem);
             }
+
+            if (PrivateKey)
+            {
+                object.WithString("privateKey", *PrivateKey);
+            }
         }
 
         CreateKeysAndCertificateResponse::CreateKeysAndCertificateResponse(const Crt::JsonView &doc)

identity/source/CreateKeysAndCertificateResponse.cpp

@@ -25,11 +25,6 @@ namespace Aws
             (void)val;
             (void)doc;
 
-            if (doc.ValueExists("errorCode"))
-            {
-                val.ErrorCode = doc.GetString("errorCode");
-            }
-
             if (doc.ValueExists("statusCode"))
             {
                 val.StatusCode = doc.GetInteger("statusCode");
@@ -39,17 +34,17 @@ namespace Aws
             {
                 val.ErrorMessage = doc.GetString("errorMessage");
             }
+
+            if (doc.ValueExists("errorCode"))
+            {
+                val.ErrorCode = doc.GetString("errorCode");
+            }
         }
 
         void ErrorResponse::SerializeToObject(Aws::Crt::JsonObject &object) const
         {
             (void)object;
 
-            if (ErrorCode)
-            {
-                object.WithString("errorCode", *ErrorCode);
-            }
-
             if (StatusCode)
             {
                 object.WithInteger("statusCode", *StatusCode);
@@ -59,6 +54,11 @@ namespace Aws
             {
                 object.WithString("errorMessage", *ErrorMessage);
             }
+
+            if (ErrorCode)
+            {
+                object.WithString("errorCode", *ErrorCode);
+            }
         }
 
         ErrorResponse::ErrorResponse(const Crt::JsonView &doc) { LoadFromObject(*this, doc); }

identity/source/ErrorResponse.cpp

@@ -25,6 +25,11 @@ namespace Aws
             (void)val;
             (void)doc;
 
+            if (doc.ValueExists("thingName"))
+            {
+                val.ThingName = doc.GetString("thingName");
+            }
+
             if (doc.ValueExists("deviceConfiguration"))
             {
                 auto deviceConfigurationMap = doc.GetJsonObject("deviceConfiguration");
@@ -37,17 +42,17 @@ namespace Aws
                         deviceConfigurationMapMember.first, std::move(deviceConfigurationMapValMember));
                 }
             }
-
-            if (doc.ValueExists("thingName"))
-            {
-                val.ThingName = doc.GetString("thingName");
-            }
         }
 
         void RegisterThingResponse::SerializeToObject(Aws::Crt::JsonObject &object) const
         {
             (void)object;
 
+            if (ThingName)
+            {
+                object.WithString("thingName", *ThingName);
+            }
+
             if (DeviceConfiguration)
             {
                 Aws::Crt::JsonObject deviceConfigurationMap;
@@ -60,11 +65,6 @@ namespace Aws
                 }
                 object.WithObject("deviceConfiguration", std::move(deviceConfigurationMap));
             }
-
-            if (ThingName)
-            {
-                object.WithString("thingName", *ThingName);
-            }
         }
 
         RegisterThingResponse::RegisterThingResponse(const Crt::JsonView &doc) { LoadFromObject(*this, doc); }

identity/source/RegisterThingResponse.cpp

@@ -99,9 +99,9 @@ target_link_libraries(IotJobs-cpp ${DEP_AWS_LIBS})
 install(FILES ${AWS_IOTJOBS_HEADERS} DESTINATION "include/aws/iotjobs/" COMPONENT Development)
 
 if (BUILD_SHARED_LIBS)
-   set(TARGET_DIR "shared")
+    set(TARGET_DIR "shared")
 else()
-   set(TARGET_DIR "static")
+    set(TARGET_DIR "static")
 endif()
 
 install(EXPORT "IotJobs-cpp-targets"

jobs/CMakeLists.txt

@@ -35,11 +35,11 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
+            Aws::Crt::Optional<int64_t> ExecutionNumber;
+            Aws::Crt::Optional<Aws::Crt::String> ThingName;
             Aws::Crt::Optional<bool> IncludeJobDocument;
             Aws::Crt::Optional<Aws::Crt::String> JobId;
             Aws::Crt::Optional<Aws::Crt::String> ClientToken;
-            Aws::Crt::Optional<int64_t> ExecutionNumber;
-            Aws::Crt::Optional<Aws::Crt::String> ThingName;
 
           private:
             static void LoadFromObject(DescribeJobExecutionRequest &obj, const Crt::JsonView &doc);