NamedShadow import (#123)

* NamedShadow import * clang-format
aws · Jun 11, 2020 · 7fa9d62 · 7fa9d62
1 parent 536b66e
commit 7fa9d62
Show file tree

Hide file tree

Showing 65 changed files with 1,772 additions and 308 deletions.
diff --git a/aws-common-runtime/aws-crt-cpp b/aws-common-runtime/aws-crt-cpp
diff --git a/identity/include/aws/iotidentity/CreateKeysAndCertificateResponse.h b/identity/include/aws/iotidentity/CreateKeysAndCertificateResponse.h
@@ -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);

diff --git a/identity/include/aws/iotidentity/ErrorResponse.h b/identity/include/aws/iotidentity/ErrorResponse.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);

diff --git a/identity/include/aws/iotidentity/RegisterThingRequest.h b/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>> 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:

diff --git a/identity/include/aws/iotidentity/RegisterThingResponse.h b/identity/include/aws/iotidentity/RegisterThingResponse.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);

diff --git a/identity/source/CreateKeysAndCertificateResponse.cpp b/identity/source/CreateKeysAndCertificateResponse.cpp
@@ -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)

diff --git a/identity/source/ErrorResponse.cpp b/identity/source/ErrorResponse.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); }

diff --git a/identity/source/RegisterThingResponse.cpp b/identity/source/RegisterThingResponse.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); }

diff --git a/jobs/CMakeLists.txt b/jobs/CMakeLists.txt
@@ -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"

diff --git a/jobs/include/aws/iotjobs/DescribeJobExecutionRequest.h b/jobs/include/aws/iotjobs/DescribeJobExecutionRequest.h
@@ -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);

diff --git a/jobs/include/aws/iotjobs/GetPendingJobExecutionsResponse.h b/jobs/include/aws/iotjobs/GetPendingJobExecutionsResponse.h
@@ -37,9 +37,9 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<Aws::Crt::String> ClientToken;
             Aws::Crt::Optional<Aws::Crt::Vector<Aws::Iotjobs::JobExecutionSummary>> QueuedJobs;
             Aws::Crt::Optional<Aws::Crt::DateTime> Timestamp;
+            Aws::Crt::Optional<Aws::Crt::String> ClientToken;
             Aws::Crt::Optional<Aws::Crt::Vector<Aws::Iotjobs::JobExecutionSummary>> InProgressJobs;
 
           private:

diff --git a/jobs/include/aws/iotjobs/JobExecutionData.h b/jobs/include/aws/iotjobs/JobExecutionData.h
@@ -39,13 +39,13 @@ namespace Aws
             void SerializeToObject(Crt::JsonObject &doc) const;
 
             Aws::Crt::Optional<Aws::Crt::String> JobId;
-            Aws::Crt::Optional<Aws::Crt::String> ThingName;
             Aws::Crt::Optional<Aws::Crt::JsonObject> JobDocument;
-            Aws::Crt::Optional<int64_t> ExecutionNumber;
-            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> StatusDetails;
             Aws::Crt::Optional<Aws::Iotjobs::JobStatus> Status;
             Aws::Crt::Optional<int32_t> VersionNumber;
             Aws::Crt::Optional<Aws::Crt::DateTime> QueuedAt;
+            Aws::Crt::Optional<Aws::Crt::String> ThingName;
+            Aws::Crt::Optional<int64_t> ExecutionNumber;
+            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> StatusDetails;
             Aws::Crt::Optional<Aws::Crt::DateTime> LastUpdatedAt;
             Aws::Crt::Optional<Aws::Crt::DateTime> StartedAt;
 

diff --git a/jobs/include/aws/iotjobs/JobExecutionState.h b/jobs/include/aws/iotjobs/JobExecutionState.h
@@ -36,8 +36,8 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<int32_t> VersionNumber;
             Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> StatusDetails;
+            Aws::Crt::Optional<int32_t> VersionNumber;
             Aws::Crt::Optional<Aws::Iotjobs::JobStatus> Status;
 
           private:

diff --git a/jobs/include/aws/iotjobs/JobExecutionSummary.h b/jobs/include/aws/iotjobs/JobExecutionSummary.h
@@ -38,9 +38,9 @@ namespace Aws
 
             Aws::Crt::Optional<Aws::Crt::DateTime> LastUpdatedAt;
             Aws::Crt::Optional<int64_t> ExecutionNumber;
+            Aws::Crt::Optional<Aws::Crt::DateTime> StartedAt;
             Aws::Crt::Optional<int32_t> VersionNumber;
             Aws::Crt::Optional<Aws::Crt::String> JobId;
-            Aws::Crt::Optional<Aws::Crt::DateTime> StartedAt;
             Aws::Crt::Optional<Aws::Crt::DateTime> QueuedAt;
 
           private:

diff --git a/jobs/include/aws/iotjobs/RejectedError.h b/jobs/include/aws/iotjobs/RejectedError.h
@@ -39,10 +39,10 @@ namespace Aws
             void SerializeToObject(Crt::JsonObject &doc) const;
 
             Aws::Crt::Optional<Aws::Crt::DateTime> Timestamp;
-            Aws::Crt::Optional<Aws::Crt::String> ClientToken;
             Aws::Crt::Optional<Aws::Iotjobs::RejectedErrorCode> Code;
-            Aws::Crt::Optional<Aws::Iotjobs::JobExecutionState> ExecutionState;
             Aws::Crt::Optional<Aws::Crt::String> Message;
+            Aws::Crt::Optional<Aws::Crt::String> ClientToken;
+            Aws::Crt::Optional<Aws::Iotjobs::JobExecutionState> ExecutionState;
 
           private:
             static void LoadFromObject(RejectedError &obj, const Crt::JsonView &doc);

diff --git a/jobs/include/aws/iotjobs/StartNextPendingJobExecutionRequest.h b/jobs/include/aws/iotjobs/StartNextPendingJobExecutionRequest.h
@@ -35,10 +35,10 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<Aws::Crt::String> ClientToken;
             Aws::Crt::Optional<Aws::Crt::String> ThingName;
-            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> StatusDetails;
             Aws::Crt::Optional<int64_t> StepTimeoutInMinutes;
+            Aws::Crt::Optional<Aws::Crt::String> ClientToken;
+            Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> StatusDetails;
 
           private:
             static void LoadFromObject(StartNextPendingJobExecutionRequest &obj, const Crt::JsonView &doc);

diff --git a/jobs/include/aws/iotjobs/UpdateJobExecutionRequest.h b/jobs/include/aws/iotjobs/UpdateJobExecutionRequest.h
@@ -37,14 +37,14 @@ namespace Aws
             void SerializeToObject(Crt::JsonObject &doc) const;
 
             Aws::Crt::Optional<Aws::Crt::String> ThingName;
-            Aws::Crt::Optional<int32_t> ExpectedVersion;
             Aws::Crt::Optional<int64_t> ExecutionNumber;
-            Aws::Crt::Optional<bool> IncludeJobDocument;
             Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> StatusDetails;
             Aws::Crt::Optional<bool> IncludeJobExecutionState;
+            Aws::Crt::Optional<Aws::Crt::String> JobId;
+            Aws::Crt::Optional<int32_t> ExpectedVersion;
+            Aws::Crt::Optional<bool> IncludeJobDocument;
             Aws::Crt::Optional<Aws::Iotjobs::JobStatus> Status;
             Aws::Crt::Optional<int64_t> StepTimeoutInMinutes;
-            Aws::Crt::Optional<Aws::Crt::String> JobId;
             Aws::Crt::Optional<Aws::Crt::String> ClientToken;
 
           private:

diff --git a/jobs/include/aws/iotjobs/UpdateJobExecutionResponse.h b/jobs/include/aws/iotjobs/UpdateJobExecutionResponse.h
@@ -38,8 +38,8 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<Aws::Crt::DateTime> Timestamp;
             Aws::Crt::Optional<Aws::Crt::String> ClientToken;
+            Aws::Crt::Optional<Aws::Crt::DateTime> Timestamp;
             Aws::Crt::Optional<Aws::Crt::JsonObject> JobDocument;
             Aws::Crt::Optional<Aws::Iotjobs::JobExecutionState> ExecutionState;
 

diff --git a/jobs/include/aws/iotjobs/UpdateJobExecutionSubscriptionRequest.h b/jobs/include/aws/iotjobs/UpdateJobExecutionSubscriptionRequest.h
@@ -35,8 +35,8 @@ namespace Aws
 
             void SerializeToObject(Crt::JsonObject &doc) const;
 
-            Aws::Crt::Optional<Aws::Crt::String> ThingName;
             Aws::Crt::Optional<Aws::Crt::String> JobId;
+            Aws::Crt::Optional<Aws::Crt::String> ThingName;
 
           private:
             static void LoadFromObject(UpdateJobExecutionSubscriptionRequest &obj, const Crt::JsonView &doc);

diff --git a/jobs/source/DescribeJobExecutionRequest.cpp b/jobs/source/DescribeJobExecutionRequest.cpp
@@ -27,6 +27,11 @@ namespace Aws
             (void)val;
             (void)doc;
 
+            if (doc.ValueExists("executionNumber"))
+            {
+                val.ExecutionNumber = doc.GetInt64("executionNumber");
+            }
+
             if (doc.ValueExists("includeJobDocument"))
             {
                 val.IncludeJobDocument = doc.GetBool("includeJobDocument");
@@ -36,17 +41,17 @@ namespace Aws
             {
                 val.ClientToken = doc.GetString("clientToken");
             }
-
-            if (doc.ValueExists("executionNumber"))
-            {
-                val.ExecutionNumber = doc.GetInt64("executionNumber");
-            }
         }
 
         void DescribeJobExecutionRequest::SerializeToObject(Aws::Crt::JsonObject &object) const
         {
             (void)object;
 
+            if (ExecutionNumber)
+            {
+                object.WithInt64("executionNumber", *ExecutionNumber);
+            }
+
             if (IncludeJobDocument)
             {
                 object.WithBool("includeJobDocument", *IncludeJobDocument);
@@ -56,11 +61,6 @@ namespace Aws
             {
                 object.WithString("clientToken", *ClientToken);
             }
-
-            if (ExecutionNumber)
-            {
-                object.WithInt64("executionNumber", *ExecutionNumber);
-            }
         }
 
         DescribeJobExecutionRequest::DescribeJobExecutionRequest(const Crt::JsonView &doc)