From 1ab7e2899d934b219568ab099006901652e2079e Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:06:59 -0700 Subject: [PATCH 01/11] test: KMS throws IllegalStateException --- .../examples/keyring/TestHierarchicalKeyringExample.java | 2 +- project.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/runtimes/java/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/keyring/TestHierarchicalKeyringExample.java b/Examples/runtimes/java/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/keyring/TestHierarchicalKeyringExample.java index 92f0d7f62..3a30f949b 100644 --- a/Examples/runtimes/java/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/keyring/TestHierarchicalKeyringExample.java +++ b/Examples/runtimes/java/DynamoDbEncryption/src/test/java/software/amazon/cryptography/examples/keyring/TestHierarchicalKeyringExample.java @@ -12,7 +12,7 @@ public void TestHierarchicalKeyringExample() throws InterruptedException { String keyId1 = CreateKeyStoreKeyExample.KeyStoreCreateKey( TestUtils.TEST_KEYSTORE_NAME, TestUtils.TEST_LOGICAL_KEYSTORE_NAME, - TestUtils.TEST_KEYSTORE_KMS_KEY_ID + "arn:aws:kms:us-west-2:370957321024:key/e20ac7b8-3d95-46ee-b3d5-f5dca6393945" ); String keyId2 = CreateKeyStoreKeyExample.KeyStoreCreateKey( TestUtils.TEST_KEYSTORE_NAME, diff --git a/project.properties b/project.properties index e35812981..1640c10f1 100644 --- a/project.properties +++ b/project.properties @@ -1,5 +1,5 @@ -projectJavaVersion=3.5.0-SNAPSHOT -mplDependencyJavaVersion=1.4.0 +projectJavaVersion=3.5.0 +mplDependencyJavaVersion=1.5.0 dafnyVersion=4.2.0 dafnyRuntimeJavaVersion=4.2.0 smithyDafnyJavaConversionVersion=0.1 From e0a3b17d4b49807ec599cd85b8e313280b9cc837 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Fri, 28 Jun 2024 17:57:57 -0700 Subject: [PATCH 02/11] try beneration fix --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index b6d28dcd6..8e26ba43a 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit b6d28dcd6968b00fa200fc0d51a1c83f437191ab +Subproject commit 8e26ba43a7c3c1e63983e701ca68b60e7532fba5 From 276e52303c9ffcc2febcdaa2e46da880108315c4 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:43:33 -0700 Subject: [PATCH 03/11] fix(Java-SDK): handle generic exceptions better --- project.properties | 2 +- submodules/MaterialProviders | 2 +- submodules/smithy-dafny | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.properties b/project.properties index 1640c10f1..f51c5083b 100644 --- a/project.properties +++ b/project.properties @@ -1,5 +1,5 @@ projectJavaVersion=3.5.0 -mplDependencyJavaVersion=1.5.0 +mplDependencyJavaVersion=1.5.0-SNAPSHOT dafnyVersion=4.2.0 dafnyRuntimeJavaVersion=4.2.0 smithyDafnyJavaConversionVersion=0.1 diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 8e26ba43a..e5483fe76 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 8e26ba43a7c3c1e63983e701ca68b60e7532fba5 +Subproject commit e5483fe76c5ff1c214daa7948bb56147b0b963d3 diff --git a/submodules/smithy-dafny b/submodules/smithy-dafny index d9c596cb8..1acfd7bc8 160000 --- a/submodules/smithy-dafny +++ b/submodules/smithy-dafny @@ -1 +1 @@ -Subproject commit d9c596cb85ce55434efb57a5f88e6dd7fb68d505 +Subproject commit 1acfd7bc83c8195981d76949b9b4850f29ccaa56 From d5092aaa17441d8b7b8538003c8f33de9355e996 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:48:55 -0700 Subject: [PATCH 04/11] chore(Model): no /// allowed in Smithy --- .../dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy | 1 - .../DynamoDbItemEncryptor/Model/DynamoDbItemEncryptor.smithy | 1 - .../dafny/StructuredEncryption/Model/StructuredEncryption.smithy | 1 - 3 files changed, 3 deletions(-) diff --git a/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy b/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy index b4fa422a0..64b4c82ac 100644 --- a/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy +++ b/DynamoDbEncryption/dafny/DynamoDbEncryption/Model/DynamoDbEncryption.smithy @@ -873,7 +873,6 @@ structure CreateDynamoDbEncryptionBranchKeyIdSupplierOutput { branchKeyIdSupplier: BranchKeyIdSupplierReference } -///////////// // Errors @error("client") diff --git a/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/Model/DynamoDbItemEncryptor.smithy b/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/Model/DynamoDbItemEncryptor.smithy index d128547b4..ae11f9361 100644 --- a/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/Model/DynamoDbItemEncryptor.smithy +++ b/DynamoDbEncryption/dafny/DynamoDbItemEncryptor/Model/DynamoDbItemEncryptor.smithy @@ -224,7 +224,6 @@ structure AtomicPrimitivesReference {} @aws.polymorph#reference(service: aws.cryptography.dbEncryptionSdk.structuredEncryption#StructuredEncryption) structure StructuredEncryptionReference {} -///////////// // Errors @error("client") diff --git a/DynamoDbEncryption/dafny/StructuredEncryption/Model/StructuredEncryption.smithy b/DynamoDbEncryption/dafny/StructuredEncryption/Model/StructuredEncryption.smithy index c44a6bc00..a8e2fff5d 100644 --- a/DynamoDbEncryption/dafny/StructuredEncryption/Model/StructuredEncryption.smithy +++ b/DynamoDbEncryption/dafny/StructuredEncryption/Model/StructuredEncryption.smithy @@ -405,7 +405,6 @@ list AuthList { @aws.polymorph#reference(service: aws.cryptography.primitives#AwsCryptographicPrimitives) structure AtomicPrimitivesReference {} -///////////// // Errors @error("client") From 935e3dca05482a17ea93a97495e0134d26834684 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:59:21 -0700 Subject: [PATCH 05/11] chore(.NET): transitively depend on deps --- .../runtimes/net/DynamoDbEncryption.csproj | 7 ------- .../net/tests/Test-DynamoDbEncryption.csproj | 12 +----------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj index 97376ee32..a11dabc82 100644 --- a/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj +++ b/DynamoDbEncryption/runtimes/net/DynamoDbEncryption.csproj @@ -57,18 +57,11 @@ - - - - - - - diff --git a/DynamoDbEncryption/runtimes/net/tests/Test-DynamoDbEncryption.csproj b/DynamoDbEncryption/runtimes/net/tests/Test-DynamoDbEncryption.csproj index c3ccf953b..0a7c9ed75 100644 --- a/DynamoDbEncryption/runtimes/net/tests/Test-DynamoDbEncryption.csproj +++ b/DynamoDbEncryption/runtimes/net/tests/Test-DynamoDbEncryption.csproj @@ -9,17 +9,7 @@ Exe false - - - - - - - - + From 6f387b0441a933d73749bb5554c89c11f7c6ab1d Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:20:05 -0700 Subject: [PATCH 06/11] chore: disable NoMarkupInDocumentationTraitsValidator to unblock DB-ESDK --- submodules/smithy-dafny | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/smithy-dafny b/submodules/smithy-dafny index 1acfd7bc8..af4ee06bd 160000 --- a/submodules/smithy-dafny +++ b/submodules/smithy-dafny @@ -1 +1 @@ -Subproject commit 1acfd7bc83c8195981d76949b9b4850f29ccaa56 +Subproject commit af4ee06bdf63496f55e1e1fd537e7b2d2d99e794 From 7f5e0a14e8a6aa11f5653d0c9f3aa628e2dc097c Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:20:38 -0700 Subject: [PATCH 07/11] fix: make check_polymorph_diff pass by committing properties --- submodules/MaterialProviders | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index e5483fe76..ddf8e2ba8 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit e5483fe76c5ff1c214daa7948bb56147b0b963d3 +Subproject commit ddf8e2ba8732730669165e5aaac49c12fe504393 From 2181d8942b010e79f81b60116b9dc0b771ef24d6 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:28:31 -0700 Subject: [PATCH 08/11] chore(Java): re-polymorph --- .../BatchGetItemInputTransformInput.java | 12 ++++++++++ .../BatchGetItemInputTransformOutput.java | 12 ++++++++++ .../BatchGetItemOutputTransformInput.java | 24 +++++++++++++++++++ .../BatchGetItemOutputTransformOutput.java | 12 ++++++++++ .../BatchWriteItemInputTransformInput.java | 12 ++++++++++ .../BatchWriteItemInputTransformOutput.java | 12 ++++++++++ .../BatchWriteItemOutputTransformInput.java | 24 +++++++++++++++++++ .../BatchWriteItemOutputTransformOutput.java | 12 ++++++++++ .../model/DeleteItemInputTransformInput.java | 12 ++++++++++ .../model/DeleteItemInputTransformOutput.java | 12 ++++++++++ .../model/DeleteItemOutputTransformInput.java | 24 +++++++++++++++++++ .../DeleteItemOutputTransformOutput.java | 12 ++++++++++ .../model/GetItemInputTransformInput.java | 12 ++++++++++ .../model/GetItemInputTransformOutput.java | 12 ++++++++++ .../model/GetItemOutputTransformInput.java | 24 +++++++++++++++++++ .../model/GetItemOutputTransformOutput.java | 12 ++++++++++ .../model/PutItemInputTransformInput.java | 12 ++++++++++ .../model/PutItemInputTransformOutput.java | 12 ++++++++++ .../model/PutItemOutputTransformInput.java | 24 +++++++++++++++++++ .../model/PutItemOutputTransformOutput.java | 12 ++++++++++ .../model/QueryInputTransformInput.java | 12 ++++++++++ .../model/QueryInputTransformOutput.java | 12 ++++++++++ .../model/QueryOutputTransformInput.java | 24 +++++++++++++++++++ .../model/QueryOutputTransformOutput.java | 12 ++++++++++ .../model/ScanInputTransformInput.java | 12 ++++++++++ .../model/ScanInputTransformOutput.java | 12 ++++++++++ .../model/ScanOutputTransformInput.java | 24 +++++++++++++++++++ .../model/ScanOutputTransformOutput.java | 12 ++++++++++ .../model/UpdateItemInputTransformInput.java | 12 ++++++++++ .../model/UpdateItemInputTransformOutput.java | 12 ++++++++++ .../model/UpdateItemOutputTransformInput.java | 24 +++++++++++++++++++ .../UpdateItemOutputTransformOutput.java | 12 ++++++++++ 32 files changed, 480 insertions(+) diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformInput.java index 360c70c49..a0f0bd0e9 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformInput.java @@ -8,12 +8,18 @@ public class BatchGetItemInputTransformInput { + /** + *

Represents the input of a BatchGetItem operation.

+ */ private final BatchGetItemRequest sdkInput; protected BatchGetItemInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of a BatchGetItem operation.

+ */ public BatchGetItemRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of a BatchGetItem operation.

+ */ Builder sdkInput(BatchGetItemRequest sdkInput); + /** + * @return

Represents the input of a BatchGetItem operation.

+ */ BatchGetItemRequest sdkInput(); BatchGetItemInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformOutput.java index ca9f10aa4..807674dd3 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemInputTransformOutput.java @@ -8,12 +8,18 @@ public class BatchGetItemInputTransformOutput { + /** + *

Represents the input of a BatchGetItem operation.

+ */ private final BatchGetItemRequest transformedInput; protected BatchGetItemInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of a BatchGetItem operation.

+ */ public BatchGetItemRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of a BatchGetItem operation.

+ */ Builder transformedInput(BatchGetItemRequest transformedInput); + /** + * @return

Represents the input of a BatchGetItem operation.

+ */ BatchGetItemRequest transformedInput(); BatchGetItemInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformInput.java index 5769cb985..c6afc9f5f 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformInput.java @@ -9,8 +9,14 @@ public class BatchGetItemOutputTransformInput { + /** + *

Represents the output of a BatchGetItem operation.

+ */ private final BatchGetItemResponse sdkOutput; + /** + *

Represents the input of a BatchGetItem operation.

+ */ private final BatchGetItemRequest originalInput; protected BatchGetItemOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected BatchGetItemOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of a BatchGetItem operation.

+ */ public BatchGetItemResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of a BatchGetItem operation.

+ */ public BatchGetItemRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of a BatchGetItem operation.

+ */ Builder sdkOutput(BatchGetItemResponse sdkOutput); + /** + * @return

Represents the output of a BatchGetItem operation.

+ */ BatchGetItemResponse sdkOutput(); + /** + * @param originalInput

Represents the input of a BatchGetItem operation.

+ */ Builder originalInput(BatchGetItemRequest originalInput); + /** + * @return

Represents the input of a BatchGetItem operation.

+ */ BatchGetItemRequest originalInput(); BatchGetItemOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformOutput.java index 551a85a67..efbb90723 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchGetItemOutputTransformOutput.java @@ -8,12 +8,18 @@ public class BatchGetItemOutputTransformOutput { + /** + *

Represents the output of a BatchGetItem operation.

+ */ private final BatchGetItemResponse transformedOutput; protected BatchGetItemOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of a BatchGetItem operation.

+ */ public BatchGetItemResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of a BatchGetItem operation.

+ */ Builder transformedOutput(BatchGetItemResponse transformedOutput); + /** + * @return

Represents the output of a BatchGetItem operation.

+ */ BatchGetItemResponse transformedOutput(); BatchGetItemOutputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformInput.java index 2b162ea90..eb493cc6d 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformInput.java @@ -8,12 +8,18 @@ public class BatchWriteItemInputTransformInput { + /** + *

Represents the input of a BatchWriteItem operation.

+ */ private final BatchWriteItemRequest sdkInput; protected BatchWriteItemInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of a BatchWriteItem operation.

+ */ public BatchWriteItemRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of a BatchWriteItem operation.

+ */ Builder sdkInput(BatchWriteItemRequest sdkInput); + /** + * @return

Represents the input of a BatchWriteItem operation.

+ */ BatchWriteItemRequest sdkInput(); BatchWriteItemInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformOutput.java index 62014c5d1..317a931ba 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemInputTransformOutput.java @@ -8,12 +8,18 @@ public class BatchWriteItemInputTransformOutput { + /** + *

Represents the input of a BatchWriteItem operation.

+ */ private final BatchWriteItemRequest transformedInput; protected BatchWriteItemInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of a BatchWriteItem operation.

+ */ public BatchWriteItemRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of a BatchWriteItem operation.

+ */ Builder transformedInput(BatchWriteItemRequest transformedInput); + /** + * @return

Represents the input of a BatchWriteItem operation.

+ */ BatchWriteItemRequest transformedInput(); BatchWriteItemInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformInput.java index 711e59ed8..f720aa65e 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformInput.java @@ -9,8 +9,14 @@ public class BatchWriteItemOutputTransformInput { + /** + *

Represents the output of a BatchWriteItem operation.

+ */ private final BatchWriteItemResponse sdkOutput; + /** + *

Represents the input of a BatchWriteItem operation.

+ */ private final BatchWriteItemRequest originalInput; protected BatchWriteItemOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected BatchWriteItemOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of a BatchWriteItem operation.

+ */ public BatchWriteItemResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of a BatchWriteItem operation.

+ */ public BatchWriteItemRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of a BatchWriteItem operation.

+ */ Builder sdkOutput(BatchWriteItemResponse sdkOutput); + /** + * @return

Represents the output of a BatchWriteItem operation.

+ */ BatchWriteItemResponse sdkOutput(); + /** + * @param originalInput

Represents the input of a BatchWriteItem operation.

+ */ Builder originalInput(BatchWriteItemRequest originalInput); + /** + * @return

Represents the input of a BatchWriteItem operation.

+ */ BatchWriteItemRequest originalInput(); BatchWriteItemOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformOutput.java index cb6d0a66c..19bc50307 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/BatchWriteItemOutputTransformOutput.java @@ -8,12 +8,18 @@ public class BatchWriteItemOutputTransformOutput { + /** + *

Represents the output of a BatchWriteItem operation.

+ */ private final BatchWriteItemResponse transformedOutput; protected BatchWriteItemOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of a BatchWriteItem operation.

+ */ public BatchWriteItemResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of a BatchWriteItem operation.

+ */ Builder transformedOutput(BatchWriteItemResponse transformedOutput); + /** + * @return

Represents the output of a BatchWriteItem operation.

+ */ BatchWriteItemResponse transformedOutput(); BatchWriteItemOutputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformInput.java index 94f14a622..b459bc907 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformInput.java @@ -8,12 +8,18 @@ public class DeleteItemInputTransformInput { + /** + *

Represents the input of a DeleteItem operation.

+ */ private final DeleteItemRequest sdkInput; protected DeleteItemInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of a DeleteItem operation.

+ */ public DeleteItemRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of a DeleteItem operation.

+ */ Builder sdkInput(DeleteItemRequest sdkInput); + /** + * @return

Represents the input of a DeleteItem operation.

+ */ DeleteItemRequest sdkInput(); DeleteItemInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformOutput.java index f4295e34b..e1668f03a 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemInputTransformOutput.java @@ -8,12 +8,18 @@ public class DeleteItemInputTransformOutput { + /** + *

Represents the input of a DeleteItem operation.

+ */ private final DeleteItemRequest transformedInput; protected DeleteItemInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of a DeleteItem operation.

+ */ public DeleteItemRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of a DeleteItem operation.

+ */ Builder transformedInput(DeleteItemRequest transformedInput); + /** + * @return

Represents the input of a DeleteItem operation.

+ */ DeleteItemRequest transformedInput(); DeleteItemInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformInput.java index 0147e9520..8cd44af88 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformInput.java @@ -9,8 +9,14 @@ public class DeleteItemOutputTransformInput { + /** + *

Represents the output of a DeleteItem operation.

+ */ private final DeleteItemResponse sdkOutput; + /** + *

Represents the input of a DeleteItem operation.

+ */ private final DeleteItemRequest originalInput; protected DeleteItemOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected DeleteItemOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of a DeleteItem operation.

+ */ public DeleteItemResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of a DeleteItem operation.

+ */ public DeleteItemRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of a DeleteItem operation.

+ */ Builder sdkOutput(DeleteItemResponse sdkOutput); + /** + * @return

Represents the output of a DeleteItem operation.

+ */ DeleteItemResponse sdkOutput(); + /** + * @param originalInput

Represents the input of a DeleteItem operation.

+ */ Builder originalInput(DeleteItemRequest originalInput); + /** + * @return

Represents the input of a DeleteItem operation.

+ */ DeleteItemRequest originalInput(); DeleteItemOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformOutput.java index 8c9f1d184..883df60bc 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/DeleteItemOutputTransformOutput.java @@ -8,12 +8,18 @@ public class DeleteItemOutputTransformOutput { + /** + *

Represents the output of a DeleteItem operation.

+ */ private final DeleteItemResponse transformedOutput; protected DeleteItemOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of a DeleteItem operation.

+ */ public DeleteItemResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of a DeleteItem operation.

+ */ Builder transformedOutput(DeleteItemResponse transformedOutput); + /** + * @return

Represents the output of a DeleteItem operation.

+ */ DeleteItemResponse transformedOutput(); DeleteItemOutputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformInput.java index 99808cc7d..9ab5e25f0 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformInput.java @@ -8,12 +8,18 @@ public class GetItemInputTransformInput { + /** + *

Represents the input of a GetItem operation.

+ */ private final GetItemRequest sdkInput; protected GetItemInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of a GetItem operation.

+ */ public GetItemRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of a GetItem operation.

+ */ Builder sdkInput(GetItemRequest sdkInput); + /** + * @return

Represents the input of a GetItem operation.

+ */ GetItemRequest sdkInput(); GetItemInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformOutput.java index a94eb1600..b0b057d00 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemInputTransformOutput.java @@ -8,12 +8,18 @@ public class GetItemInputTransformOutput { + /** + *

Represents the input of a GetItem operation.

+ */ private final GetItemRequest transformedInput; protected GetItemInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of a GetItem operation.

+ */ public GetItemRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of a GetItem operation.

+ */ Builder transformedInput(GetItemRequest transformedInput); + /** + * @return

Represents the input of a GetItem operation.

+ */ GetItemRequest transformedInput(); GetItemInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformInput.java index 764fe7cdc..b11d9e391 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformInput.java @@ -9,8 +9,14 @@ public class GetItemOutputTransformInput { + /** + *

Represents the output of a GetItem operation.

+ */ private final GetItemResponse sdkOutput; + /** + *

Represents the input of a GetItem operation.

+ */ private final GetItemRequest originalInput; protected GetItemOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected GetItemOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of a GetItem operation.

+ */ public GetItemResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of a GetItem operation.

+ */ public GetItemRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of a GetItem operation.

+ */ Builder sdkOutput(GetItemResponse sdkOutput); + /** + * @return

Represents the output of a GetItem operation.

+ */ GetItemResponse sdkOutput(); + /** + * @param originalInput

Represents the input of a GetItem operation.

+ */ Builder originalInput(GetItemRequest originalInput); + /** + * @return

Represents the input of a GetItem operation.

+ */ GetItemRequest originalInput(); GetItemOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformOutput.java index 8ebf42a5b..814006edd 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/GetItemOutputTransformOutput.java @@ -8,12 +8,18 @@ public class GetItemOutputTransformOutput { + /** + *

Represents the output of a GetItem operation.

+ */ private final GetItemResponse transformedOutput; protected GetItemOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of a GetItem operation.

+ */ public GetItemResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of a GetItem operation.

+ */ Builder transformedOutput(GetItemResponse transformedOutput); + /** + * @return

Represents the output of a GetItem operation.

+ */ GetItemResponse transformedOutput(); GetItemOutputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformInput.java index 9bf02f0fe..094c9f629 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformInput.java @@ -8,12 +8,18 @@ public class PutItemInputTransformInput { + /** + *

Represents the input of a PutItem operation.

+ */ private final PutItemRequest sdkInput; protected PutItemInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of a PutItem operation.

+ */ public PutItemRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of a PutItem operation.

+ */ Builder sdkInput(PutItemRequest sdkInput); + /** + * @return

Represents the input of a PutItem operation.

+ */ PutItemRequest sdkInput(); PutItemInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformOutput.java index cc06df561..574819d92 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemInputTransformOutput.java @@ -8,12 +8,18 @@ public class PutItemInputTransformOutput { + /** + *

Represents the input of a PutItem operation.

+ */ private final PutItemRequest transformedInput; protected PutItemInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of a PutItem operation.

+ */ public PutItemRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of a PutItem operation.

+ */ Builder transformedInput(PutItemRequest transformedInput); + /** + * @return

Represents the input of a PutItem operation.

+ */ PutItemRequest transformedInput(); PutItemInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformInput.java index 7e5afed34..a0b58c3f1 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformInput.java @@ -9,8 +9,14 @@ public class PutItemOutputTransformInput { + /** + *

Represents the output of a PutItem operation.

+ */ private final PutItemResponse sdkOutput; + /** + *

Represents the input of a PutItem operation.

+ */ private final PutItemRequest originalInput; protected PutItemOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected PutItemOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of a PutItem operation.

+ */ public PutItemResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of a PutItem operation.

+ */ public PutItemRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of a PutItem operation.

+ */ Builder sdkOutput(PutItemResponse sdkOutput); + /** + * @return

Represents the output of a PutItem operation.

+ */ PutItemResponse sdkOutput(); + /** + * @param originalInput

Represents the input of a PutItem operation.

+ */ Builder originalInput(PutItemRequest originalInput); + /** + * @return

Represents the input of a PutItem operation.

+ */ PutItemRequest originalInput(); PutItemOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformOutput.java index deec37efb..8961e2fee 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/PutItemOutputTransformOutput.java @@ -8,12 +8,18 @@ public class PutItemOutputTransformOutput { + /** + *

Represents the output of a PutItem operation.

+ */ private final PutItemResponse transformedOutput; protected PutItemOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of a PutItem operation.

+ */ public PutItemResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of a PutItem operation.

+ */ Builder transformedOutput(PutItemResponse transformedOutput); + /** + * @return

Represents the output of a PutItem operation.

+ */ PutItemResponse transformedOutput(); PutItemOutputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformInput.java index fe180f0d0..d1ee2f6e7 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformInput.java @@ -8,12 +8,18 @@ public class QueryInputTransformInput { + /** + *

Represents the input of a Query operation.

+ */ private final QueryRequest sdkInput; protected QueryInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of a Query operation.

+ */ public QueryRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of a Query operation.

+ */ Builder sdkInput(QueryRequest sdkInput); + /** + * @return

Represents the input of a Query operation.

+ */ QueryRequest sdkInput(); QueryInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformOutput.java index 9d8b0c0b6..a869c8253 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryInputTransformOutput.java @@ -8,12 +8,18 @@ public class QueryInputTransformOutput { + /** + *

Represents the input of a Query operation.

+ */ private final QueryRequest transformedInput; protected QueryInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of a Query operation.

+ */ public QueryRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of a Query operation.

+ */ Builder transformedInput(QueryRequest transformedInput); + /** + * @return

Represents the input of a Query operation.

+ */ QueryRequest transformedInput(); QueryInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformInput.java index c645ff4fa..6b97fde68 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformInput.java @@ -9,8 +9,14 @@ public class QueryOutputTransformInput { + /** + *

Represents the output of a Query operation.

+ */ private final QueryResponse sdkOutput; + /** + *

Represents the input of a Query operation.

+ */ private final QueryRequest originalInput; protected QueryOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected QueryOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of a Query operation.

+ */ public QueryResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of a Query operation.

+ */ public QueryRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of a Query operation.

+ */ Builder sdkOutput(QueryResponse sdkOutput); + /** + * @return

Represents the output of a Query operation.

+ */ QueryResponse sdkOutput(); + /** + * @param originalInput

Represents the input of a Query operation.

+ */ Builder originalInput(QueryRequest originalInput); + /** + * @return

Represents the input of a Query operation.

+ */ QueryRequest originalInput(); QueryOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformOutput.java index 494b68583..8280489d4 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/QueryOutputTransformOutput.java @@ -8,12 +8,18 @@ public class QueryOutputTransformOutput { + /** + *

Represents the output of a Query operation.

+ */ private final QueryResponse transformedOutput; protected QueryOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of a Query operation.

+ */ public QueryResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of a Query operation.

+ */ Builder transformedOutput(QueryResponse transformedOutput); + /** + * @return

Represents the output of a Query operation.

+ */ QueryResponse transformedOutput(); QueryOutputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformInput.java index 1c6ce9ae1..95c93a410 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformInput.java @@ -8,12 +8,18 @@ public class ScanInputTransformInput { + /** + *

Represents the input of a Scan operation.

+ */ private final ScanRequest sdkInput; protected ScanInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of a Scan operation.

+ */ public ScanRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of a Scan operation.

+ */ Builder sdkInput(ScanRequest sdkInput); + /** + * @return

Represents the input of a Scan operation.

+ */ ScanRequest sdkInput(); ScanInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformOutput.java index 295b284a5..bbd53da9a 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanInputTransformOutput.java @@ -8,12 +8,18 @@ public class ScanInputTransformOutput { + /** + *

Represents the input of a Scan operation.

+ */ private final ScanRequest transformedInput; protected ScanInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of a Scan operation.

+ */ public ScanRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of a Scan operation.

+ */ Builder transformedInput(ScanRequest transformedInput); + /** + * @return

Represents the input of a Scan operation.

+ */ ScanRequest transformedInput(); ScanInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformInput.java index f2b693935..41a7149f7 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformInput.java @@ -9,8 +9,14 @@ public class ScanOutputTransformInput { + /** + *

Represents the output of a Scan operation.

+ */ private final ScanResponse sdkOutput; + /** + *

Represents the input of a Scan operation.

+ */ private final ScanRequest originalInput; protected ScanOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected ScanOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of a Scan operation.

+ */ public ScanResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of a Scan operation.

+ */ public ScanRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of a Scan operation.

+ */ Builder sdkOutput(ScanResponse sdkOutput); + /** + * @return

Represents the output of a Scan operation.

+ */ ScanResponse sdkOutput(); + /** + * @param originalInput

Represents the input of a Scan operation.

+ */ Builder originalInput(ScanRequest originalInput); + /** + * @return

Represents the input of a Scan operation.

+ */ ScanRequest originalInput(); ScanOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformOutput.java index bcf82a72d..33dbb173e 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/ScanOutputTransformOutput.java @@ -8,12 +8,18 @@ public class ScanOutputTransformOutput { + /** + *

Represents the output of a Scan operation.

+ */ private final ScanResponse transformedOutput; protected ScanOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of a Scan operation.

+ */ public ScanResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of a Scan operation.

+ */ Builder transformedOutput(ScanResponse transformedOutput); + /** + * @return

Represents the output of a Scan operation.

+ */ ScanResponse transformedOutput(); ScanOutputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformInput.java index 8c9a6ffde..056f3cd96 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformInput.java @@ -8,12 +8,18 @@ public class UpdateItemInputTransformInput { + /** + *

Represents the input of an UpdateItem operation.

+ */ private final UpdateItemRequest sdkInput; protected UpdateItemInputTransformInput(BuilderImpl builder) { this.sdkInput = builder.sdkInput(); } + /** + * @return

Represents the input of an UpdateItem operation.

+ */ public UpdateItemRequest sdkInput() { return this.sdkInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkInput

Represents the input of an UpdateItem operation.

+ */ Builder sdkInput(UpdateItemRequest sdkInput); + /** + * @return

Represents the input of an UpdateItem operation.

+ */ UpdateItemRequest sdkInput(); UpdateItemInputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformOutput.java index 7b9635893..0d45bc38a 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemInputTransformOutput.java @@ -8,12 +8,18 @@ public class UpdateItemInputTransformOutput { + /** + *

Represents the input of an UpdateItem operation.

+ */ private final UpdateItemRequest transformedInput; protected UpdateItemInputTransformOutput(BuilderImpl builder) { this.transformedInput = builder.transformedInput(); } + /** + * @return

Represents the input of an UpdateItem operation.

+ */ public UpdateItemRequest transformedInput() { return this.transformedInput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedInput

Represents the input of an UpdateItem operation.

+ */ Builder transformedInput(UpdateItemRequest transformedInput); + /** + * @return

Represents the input of an UpdateItem operation.

+ */ UpdateItemRequest transformedInput(); UpdateItemInputTransformOutput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformInput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformInput.java index 702b7c5fb..6046efe54 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformInput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformInput.java @@ -9,8 +9,14 @@ public class UpdateItemOutputTransformInput { + /** + *

Represents the output of an UpdateItem operation.

+ */ private final UpdateItemResponse sdkOutput; + /** + *

Represents the input of an UpdateItem operation.

+ */ private final UpdateItemRequest originalInput; protected UpdateItemOutputTransformInput(BuilderImpl builder) { @@ -18,10 +24,16 @@ protected UpdateItemOutputTransformInput(BuilderImpl builder) { this.originalInput = builder.originalInput(); } + /** + * @return

Represents the output of an UpdateItem operation.

+ */ public UpdateItemResponse sdkOutput() { return this.sdkOutput; } + /** + * @return

Represents the input of an UpdateItem operation.

+ */ public UpdateItemRequest originalInput() { return this.originalInput; } @@ -35,12 +47,24 @@ public static Builder builder() { } public interface Builder { + /** + * @param sdkOutput

Represents the output of an UpdateItem operation.

+ */ Builder sdkOutput(UpdateItemResponse sdkOutput); + /** + * @return

Represents the output of an UpdateItem operation.

+ */ UpdateItemResponse sdkOutput(); + /** + * @param originalInput

Represents the input of an UpdateItem operation.

+ */ Builder originalInput(UpdateItemRequest originalInput); + /** + * @return

Represents the input of an UpdateItem operation.

+ */ UpdateItemRequest originalInput(); UpdateItemOutputTransformInput build(); diff --git a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformOutput.java b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformOutput.java index e7a5f5c83..ea8d8d5aa 100644 --- a/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformOutput.java +++ b/DynamoDbEncryption/runtimes/java/src/main/smithy-generated/software/amazon/cryptography/dbencryptionsdk/dynamodb/transforms/model/UpdateItemOutputTransformOutput.java @@ -8,12 +8,18 @@ public class UpdateItemOutputTransformOutput { + /** + *

Represents the output of an UpdateItem operation.

+ */ private final UpdateItemResponse transformedOutput; protected UpdateItemOutputTransformOutput(BuilderImpl builder) { this.transformedOutput = builder.transformedOutput(); } + /** + * @return

Represents the output of an UpdateItem operation.

+ */ public UpdateItemResponse transformedOutput() { return this.transformedOutput; } @@ -27,8 +33,14 @@ public static Builder builder() { } public interface Builder { + /** + * @param transformedOutput

Represents the output of an UpdateItem operation.

+ */ Builder transformedOutput(UpdateItemResponse transformedOutput); + /** + * @return

Represents the output of an UpdateItem operation.

+ */ UpdateItemResponse transformedOutput(); UpdateItemOutputTransformOutput build(); From 0b87846c1fa5e5c56f833aa4784cc0e9383a02c3 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:37:50 -0700 Subject: [PATCH 09/11] fix: make check_polymorph_diff pass by committing properties --- TestVectors/project.properties | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 TestVectors/project.properties diff --git a/TestVectors/project.properties b/TestVectors/project.properties new file mode 100644 index 000000000..b35126df6 --- /dev/null +++ b/TestVectors/project.properties @@ -0,0 +1,4 @@ +# This file stores the top level dafny version information. +# All elements of the project need to agree on this version. +dafnyVersion=4.2.0 +dafnyRuntimeJavaVersion=4.2.0 From 9d39b4c20f1caa230785263b509ae45ee282af13 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:41:34 -0700 Subject: [PATCH 10/11] chore(.NET): transitively depend on deps --- TestVectors/runtimes/net/DbEsdkTestVectors.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/TestVectors/runtimes/net/DbEsdkTestVectors.csproj b/TestVectors/runtimes/net/DbEsdkTestVectors.csproj index 10fbf624d..f09ec4ed0 100644 --- a/TestVectors/runtimes/net/DbEsdkTestVectors.csproj +++ b/TestVectors/runtimes/net/DbEsdkTestVectors.csproj @@ -11,8 +11,6 @@ - - From c7a9ce4d4dca2556666f736f305b28e59eea5f78 Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Mon, 1 Jul 2024 15:54:50 -0700 Subject: [PATCH 11/11] fix(TestJava): test Snapshot --- TestVectors/runtimes/java/build.gradle.kts | 2 +- submodules/MaterialProviders | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TestVectors/runtimes/java/build.gradle.kts b/TestVectors/runtimes/java/build.gradle.kts index ee1439b90..a00006e2d 100644 --- a/TestVectors/runtimes/java/build.gradle.kts +++ b/TestVectors/runtimes/java/build.gradle.kts @@ -90,7 +90,7 @@ dependencies { implementation("software.amazon.smithy.dafny:conversion:${smithyDafnyJavaConversionVersion}") implementation("software.amazon.cryptography:aws-cryptographic-material-providers:${mplVersion}") implementation("software.amazon.cryptography:aws-database-encryption-sdk-dynamodb:${ddbecVersion}") - implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:1.0-SNAPSHOT") + implementation("software.amazon.cryptography:TestAwsCryptographicMaterialProviders:${mplVersion}") implementation(platform("software.amazon.awssdk:bom:2.24.2")) implementation("software.amazon.awssdk:dynamodb") diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index ddf8e2ba8..a0d03b79f 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit ddf8e2ba8732730669165e5aaac49c12fe504393 +Subproject commit a0d03b79f4658f96a451ab1ef954edd4857bbaa9