Skip to content

Commit 7fa9d62

Browse files
author
Justin Boswell
authored
NamedShadow import (#123)
* NamedShadow import * clang-format
1 parent 536b66e commit 7fa9d62

File tree

65 files changed

+1772
-308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1772
-308
lines changed

‎aws-common-runtime/aws-crt-cpp

Submodule aws-crt-cpp updated 752 files

‎identity/include/aws/iotidentity/CreateKeysAndCertificateResponse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ namespace Aws
3636
void SerializeToObject(Crt::JsonObject &doc) const;
3737

3838
Aws::Crt::Optional<Aws::Crt::String> CertificateId;
39-
Aws::Crt::Optional<Aws::Crt::String> PrivateKey;
4039
Aws::Crt::Optional<Aws::Crt::String> CertificateOwnershipToken;
4140
Aws::Crt::Optional<Aws::Crt::String> CertificatePem;
41+
Aws::Crt::Optional<Aws::Crt::String> PrivateKey;
4242

4343
private:
4444
static void LoadFromObject(CreateKeysAndCertificateResponse &obj, const Crt::JsonView &doc);

‎identity/include/aws/iotidentity/ErrorResponse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ namespace Aws
3535

3636
void SerializeToObject(Crt::JsonObject &doc) const;
3737

38-
Aws::Crt::Optional<Aws::Crt::String> ErrorCode;
3938
Aws::Crt::Optional<int32_t> StatusCode;
4039
Aws::Crt::Optional<Aws::Crt::String> ErrorMessage;
40+
Aws::Crt::Optional<Aws::Crt::String> ErrorCode;
4141

4242
private:
4343
static void LoadFromObject(ErrorResponse &obj, const Crt::JsonView &doc);

‎identity/include/aws/iotidentity/RegisterThingRequest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ namespace Aws
3535

3636
void SerializeToObject(Crt::JsonObject &doc) const;
3737

38-
Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> Parameters;
3938
Aws::Crt::Optional<Aws::Crt::String> TemplateName;
39+
Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> Parameters;
4040
Aws::Crt::Optional<Aws::Crt::String> CertificateOwnershipToken;
4141

4242
private:

‎identity/include/aws/iotidentity/RegisterThingResponse.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ namespace Aws
3535

3636
void SerializeToObject(Crt::JsonObject &doc) const;
3737

38-
Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> DeviceConfiguration;
3938
Aws::Crt::Optional<Aws::Crt::String> ThingName;
39+
Aws::Crt::Optional<Aws::Crt::Map<Aws::Crt::String, Aws::Crt::String>> DeviceConfiguration;
4040

4141
private:
4242
static void LoadFromObject(RegisterThingResponse &obj, const Crt::JsonView &doc);

‎identity/source/CreateKeysAndCertificateResponse.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ namespace Aws
3232
val.CertificateId = doc.GetString("certificateId");
3333
}
3434

35-
if (doc.ValueExists("privateKey"))
36-
{
37-
val.PrivateKey = doc.GetString("privateKey");
38-
}
39-
4035
if (doc.ValueExists("certificateOwnershipToken"))
4136
{
4237
val.CertificateOwnershipToken = doc.GetString("certificateOwnershipToken");
@@ -46,6 +41,11 @@ namespace Aws
4641
{
4742
val.CertificatePem = doc.GetString("certificatePem");
4843
}
44+
45+
if (doc.ValueExists("privateKey"))
46+
{
47+
val.PrivateKey = doc.GetString("privateKey");
48+
}
4949
}
5050

5151
void CreateKeysAndCertificateResponse::SerializeToObject(Aws::Crt::JsonObject &object) const
@@ -57,11 +57,6 @@ namespace Aws
5757
object.WithString("certificateId", *CertificateId);
5858
}
5959

60-
if (PrivateKey)
61-
{
62-
object.WithString("privateKey", *PrivateKey);
63-
}
64-
6560
if (CertificateOwnershipToken)
6661
{
6762
object.WithString("certificateOwnershipToken", *CertificateOwnershipToken);
@@ -71,6 +66,11 @@ namespace Aws
7166
{
7267
object.WithString("certificatePem", *CertificatePem);
7368
}
69+
70+
if (PrivateKey)
71+
{
72+
object.WithString("privateKey", *PrivateKey);
73+
}
7474
}
7575

7676
CreateKeysAndCertificateResponse::CreateKeysAndCertificateResponse(const Crt::JsonView &doc)

‎identity/source/ErrorResponse.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ namespace Aws
2525
(void)val;
2626
(void)doc;
2727

28-
if (doc.ValueExists("errorCode"))
29-
{
30-
val.ErrorCode = doc.GetString("errorCode");
31-
}
32-
3328
if (doc.ValueExists("statusCode"))
3429
{
3530
val.StatusCode = doc.GetInteger("statusCode");
@@ -39,17 +34,17 @@ namespace Aws
3934
{
4035
val.ErrorMessage = doc.GetString("errorMessage");
4136
}
37+
38+
if (doc.ValueExists("errorCode"))
39+
{
40+
val.ErrorCode = doc.GetString("errorCode");
41+
}
4242
}
4343

4444
void ErrorResponse::SerializeToObject(Aws::Crt::JsonObject &object) const
4545
{
4646
(void)object;
4747

48-
if (ErrorCode)
49-
{
50-
object.WithString("errorCode", *ErrorCode);
51-
}
52-
5348
if (StatusCode)
5449
{
5550
object.WithInteger("statusCode", *StatusCode);
@@ -59,6 +54,11 @@ namespace Aws
5954
{
6055
object.WithString("errorMessage", *ErrorMessage);
6156
}
57+
58+
if (ErrorCode)
59+
{
60+
object.WithString("errorCode", *ErrorCode);
61+
}
6262
}
6363

6464
ErrorResponse::ErrorResponse(const Crt::JsonView &doc) { LoadFromObject(*this, doc); }

‎identity/source/RegisterThingResponse.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ namespace Aws
2525
(void)val;
2626
(void)doc;
2727

28+
if (doc.ValueExists("thingName"))
29+
{
30+
val.ThingName = doc.GetString("thingName");
31+
}
32+
2833
if (doc.ValueExists("deviceConfiguration"))
2934
{
3035
auto deviceConfigurationMap = doc.GetJsonObject("deviceConfiguration");
@@ -37,17 +42,17 @@ namespace Aws
3742
deviceConfigurationMapMember.first, std::move(deviceConfigurationMapValMember));
3843
}
3944
}
40-
41-
if (doc.ValueExists("thingName"))
42-
{
43-
val.ThingName = doc.GetString("thingName");
44-
}
4545
}
4646

4747
void RegisterThingResponse::SerializeToObject(Aws::Crt::JsonObject &object) const
4848
{
4949
(void)object;
5050

51+
if (ThingName)
52+
{
53+
object.WithString("thingName", *ThingName);
54+
}
55+
5156
if (DeviceConfiguration)
5257
{
5358
Aws::Crt::JsonObject deviceConfigurationMap;
@@ -60,11 +65,6 @@ namespace Aws
6065
}
6166
object.WithObject("deviceConfiguration", std::move(deviceConfigurationMap));
6267
}
63-
64-
if (ThingName)
65-
{
66-
object.WithString("thingName", *ThingName);
67-
}
6868
}
6969

7070
RegisterThingResponse::RegisterThingResponse(const Crt::JsonView &doc) { LoadFromObject(*this, doc); }

‎jobs/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ target_link_libraries(IotJobs-cpp ${DEP_AWS_LIBS})
9999
install(FILES ${AWS_IOTJOBS_HEADERS} DESTINATION "include/aws/iotjobs/" COMPONENT Development)
100100

101101
if (BUILD_SHARED_LIBS)
102-
set(TARGET_DIR "shared")
102+
set(TARGET_DIR "shared")
103103
else()
104-
set(TARGET_DIR "static")
104+
set(TARGET_DIR "static")
105105
endif()
106106

107107
install(EXPORT "IotJobs-cpp-targets"

‎jobs/include/aws/iotjobs/DescribeJobExecutionRequest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ namespace Aws
3535

3636
void SerializeToObject(Crt::JsonObject &doc) const;
3737

38+
Aws::Crt::Optional<int64_t> ExecutionNumber;
39+
Aws::Crt::Optional<Aws::Crt::String> ThingName;
3840
Aws::Crt::Optional<bool> IncludeJobDocument;
3941
Aws::Crt::Optional<Aws::Crt::String> JobId;
4042
Aws::Crt::Optional<Aws::Crt::String> ClientToken;
41-
Aws::Crt::Optional<int64_t> ExecutionNumber;
42-
Aws::Crt::Optional<Aws::Crt::String> ThingName;
4343

4444
private:
4545
static void LoadFromObject(DescribeJobExecutionRequest &obj, const Crt::JsonView &doc);

0 commit comments

Comments
 (0)