From 99f42a751719872f5b51f575daf5be9c8fcc29e6 Mon Sep 17 00:00:00 2001 From: Tyler Roach Date: Fri, 22 Jul 2022 16:12:17 -0400 Subject: [PATCH 01/14] Stop transfer service if all transfers complete (#2950) --- .../s3/transferutility/TransferService.java | 12 +++- .../s3/transferutility/TransferState.java | 6 ++ .../TransferStatusUpdater.java | 66 ++++++++++++------- 3 files changed, 57 insertions(+), 27 deletions(-) diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java index f3695d863d..0a07000042 100644 --- a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java +++ b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java @@ -49,14 +49,19 @@ public class TransferService extends Service { static TransferNetworkLossHandler transferNetworkLossHandler; /** - * A flag indicates whether the service is started the first time. + * A flag indicates whether or not the receiver has is started the first time. */ boolean isReceiverNotRegistered = true; + /** + * A flag that indicates whether or not the Foreground notification started + */ + boolean hasNotificationShown = false; + /** * The identifier used for the notification. */ - private int ongoingNotificationId = 1; + private int ongoingNotificationId = 3462; /** * This flag determines if the notification needs to be removed @@ -137,7 +142,8 @@ public int onStartCommand(Intent intent, int flags, int startId) { * b) An identifier for the ongoing notification c) Flag that determines if the notification * needs to be removed when the service is moved out of the foreground state. */ - if (Build.VERSION.SDK_INT >= ANDROID_OREO) { + if (Build.VERSION.SDK_INT >= ANDROID_OREO && !hasNotificationShown) { + hasNotificationShown = true; try { synchronized (this) { final Notification userProvidedNotification = (Notification) intent.getParcelableExtra(INTENT_KEY_NOTIFICATION); diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferState.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferState.java index bcc301d7c0..7810f26552 100644 --- a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferState.java +++ b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferState.java @@ -127,4 +127,10 @@ public static TransferState getState(String stateAsString) { + " transfer will be have state set to UNKNOWN."); return UNKNOWN; } + + protected static boolean isFinalState(TransferState transferState) { + return TransferState.COMPLETED.equals(transferState) || + TransferState.FAILED.equals(transferState) || + TransferState.CANCELED.equals(transferState); + } } diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java index 14bf6d5ceb..c8f2615272 100644 --- a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java +++ b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java @@ -16,6 +16,7 @@ package com.amazonaws.mobileconnectors.s3.transferutility; import android.content.Context; +import android.content.Intent; import android.os.Handler; import android.os.Looper; @@ -70,6 +71,11 @@ class TransferStatusUpdater { */ private final Handler mainHandler; + /** + * Context required to stop TransferService on all transfers completed + */ + private Context context; + /** * The Singleton instance. */ @@ -88,8 +94,9 @@ class TransferStatusUpdater { * The updater is made a singleton. Use #getInstance for getting * the object of the updater. */ - TransferStatusUpdater(TransferDBUtil dbUtilInstance) { + TransferStatusUpdater(TransferDBUtil dbUtilInstance, Context context) { dbUtil = dbUtilInstance; + this.context = context; mainHandler = new Handler(Looper.getMainLooper()); transfers = new ConcurrentHashMap(); } @@ -103,7 +110,7 @@ class TransferStatusUpdater { public static synchronized TransferStatusUpdater getInstance(Context context) { if (transferStatusUpdater == null) { dbUtil = new TransferDBUtil(context); - transferStatusUpdater = new TransferStatusUpdater(dbUtil); + transferStatusUpdater = new TransferStatusUpdater(dbUtil, context); } return transferStatusUpdater; } @@ -212,33 +219,44 @@ synchronized void updateState(final int id, final TransferState newState) { synchronized (LISTENERS) { final List list = LISTENERS.get(id); - if (list == null || list.isEmpty()) { - return; - } + if (list != null && !list.isEmpty()) { + // invoke TransferListener callback on main thread + for (final TransferListener l : list) { + // If instance is TransferStatusListener, post immediately. + // Posting to main thread can cause a missed status. + if (l instanceof TransferObserver.TransferStatusListener) { + l.onStateChanged(id, newState); + } else { + mainHandler.post(new Runnable() { + @Override + public void run() { + l.onStateChanged(id, newState); + } + }); + } + } - // invoke TransferListener callback on main thread - for (final TransferListener l : list) { - // If instance is TransferStatusListener, post immediately. - // Posting to main thread can cause a missed status. - if (l instanceof TransferObserver.TransferStatusListener) { - l.onStateChanged(id, newState); - } else { - mainHandler.post(new Runnable() { - @Override - public void run() { - l.onStateChanged(id, newState); - } - }); + // remove all LISTENERS when the transfer is in a final state so + // as to release resources ASAP. + if (TransferState.isFinalState(newState)) { + list.clear(); } } + } - // remove all LISTENERS when the transfer is in a final state so - // as to release resources ASAP. - if (TransferState.COMPLETED.equals(newState) || - TransferState.FAILED.equals(newState) || - TransferState.CANCELED.equals(newState)) { - list.clear(); + // If all transfers in local map are completed, + // stop TransferService to clear foreground notification + boolean stopTransferService = true; + for (TransferRecord record: transfers.values()) { + if (!TransferState.isFinalState(record.state)) { + stopTransferService = false; + LOGGER.info("Transfers still pending, keeping TransferService running."); } + break; + } + if (stopTransferService) { + LOGGER.info("All transfers in final state. Stopping TransferService"); + context.stopService(new Intent(context, TransferService.class)); } } From b5623abe74efa2df623109a7a0c94bf55f37c2b9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 25 Jul 2022 10:31:25 -0400 Subject: [PATCH 02/14] release: AWS SDK for Android 2.50.0 (#2956) Co-authored-by: awsmobilesdk-dev+ghops --- CHANGELOG.md | 12 ++++++++++++ gradle.properties | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4870d0809..f97a7e5648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## [Release 2.50.0](https://github.com/aws-amplify/aws-sdk-android/releases/tag/release_v2.50.0) + +### Features +- **aws-android-sdk-iot:** update models to latest (#2936) +- **aws-android-sdk-translate:** update models to latest (#2940) +- **aws-android-sdk-polly:** update models to latest (#2938) + +### Miscellaneous +- Stop transfer service if all transfers complete (#2950) + +[See all changes between 2.49.0 and 2.50.0](https://github.com/aws-amplify/aws-sdk-android/compare/release_v2.49.0...release_v2.50.0) + ## [Release 2.49.0](https://github.com/aws-amplify/aws-sdk-android/releases/tag/release_v2.49.0) ### Features diff --git a/gradle.properties b/gradle.properties index 67bb9f17e3..a2ea3fa899 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ android.enableJetifier=true GROUP=com.amazonaws -VERSION_NAME=2.49.0 +VERSION_NAME=2.50.0 POM_URL=https://github.com/aws/aws-sdk-android POM_SCM_URL=https://github.com/aws/aws-sdk-android From d1c1a4e9b62bad0bff62c4b3cafaac68d535fdbb Mon Sep 17 00:00:00 2001 From: Tyler Roach Date: Thu, 28 Jul 2022 11:29:48 -0400 Subject: [PATCH 03/14] Fix: Prevent startForeground crash and TransferService stopping while transfers ongoing (#2961) * Awlays call startForeground, even if notification already shown * Break is in the wrong place and couild cause transfer service to get killed when it shouldn't * Only stop transfer service on Android versions that show Foreground Notification --- .../s3/transferutility/TransferService.java | 8 +------ .../TransferStatusUpdater.java | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java index 0a07000042..2807bf76d4 100644 --- a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java +++ b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferService.java @@ -53,11 +53,6 @@ public class TransferService extends Service { */ boolean isReceiverNotRegistered = true; - /** - * A flag that indicates whether or not the Foreground notification started - */ - boolean hasNotificationShown = false; - /** * The identifier used for the notification. */ @@ -142,8 +137,7 @@ public int onStartCommand(Intent intent, int flags, int startId) { * b) An identifier for the ongoing notification c) Flag that determines if the notification * needs to be removed when the service is moved out of the foreground state. */ - if (Build.VERSION.SDK_INT >= ANDROID_OREO && !hasNotificationShown) { - hasNotificationShown = true; + if (Build.VERSION.SDK_INT >= ANDROID_OREO) { try { synchronized (this) { final Notification userProvidedNotification = (Notification) intent.getParcelableExtra(INTENT_KEY_NOTIFICATION); diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java index c8f2615272..35a6b41362 100644 --- a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java +++ b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java @@ -17,6 +17,7 @@ import android.content.Context; import android.content.Intent; +import android.os.Build; import android.os.Handler; import android.os.Looper; @@ -246,17 +247,19 @@ public void run() { // If all transfers in local map are completed, // stop TransferService to clear foreground notification - boolean stopTransferService = true; - for (TransferRecord record: transfers.values()) { - if (!TransferState.isFinalState(record.state)) { - stopTransferService = false; - LOGGER.info("Transfers still pending, keeping TransferService running."); + if (Build.VERSION.SDK_INT >= 26) { + boolean stopTransferService = true; + for (TransferRecord record : transfers.values()) { + if (!TransferState.isFinalState(record.state)) { + stopTransferService = false; + LOGGER.info("Transfers still pending, keeping TransferService running."); + break; + } + } + if (stopTransferService) { + LOGGER.info("All transfers in final state. Stopping TransferService"); + context.stopService(new Intent(context, TransferService.class)); } - break; - } - if (stopTransferService) { - LOGGER.info("All transfers in final state. Stopping TransferService"); - context.stopService(new Intent(context, TransferService.class)); } } From 8f6f2281acf40297a078219a0fd97ae8cbc079c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 28 Jul 2022 12:03:35 -0400 Subject: [PATCH 04/14] release: AWS SDK for Android 2.50.1 (#2962) Co-authored-by: awsmobilesdk-dev+ghops --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f97a7e5648..8bcad2e7ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [Release 2.50.1](https://github.com/aws-amplify/aws-sdk-android/releases/tag/release_v2.50.1) + +### Miscellaneous +- Fix: Prevent startForeground crash and TransferService stopping while transfers ongoing (#2961) + +[See all changes between 2.50.0 and 2.50.1](https://github.com/aws-amplify/aws-sdk-android/compare/release_v2.50.0...release_v2.50.1) + ## [Release 2.50.0](https://github.com/aws-amplify/aws-sdk-android/releases/tag/release_v2.50.0) ### Features diff --git a/gradle.properties b/gradle.properties index a2ea3fa899..3815a26a60 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ android.enableJetifier=true GROUP=com.amazonaws -VERSION_NAME=2.50.0 +VERSION_NAME=2.50.1 POM_URL=https://github.com/aws/aws-sdk-android POM_SCM_URL=https://github.com/aws/aws-sdk-android From b221dabe88ef4a103c44a69316936116bd7478b8 Mon Sep 17 00:00:00 2001 From: AWS Mobile SDK Bot <46607340+awsmobilesdk@users.noreply.github.com> Date: Tue, 9 Aug 2022 07:05:27 -0700 Subject: [PATCH 05/14] feat(aws-android-sdk-iot): update models to latest (#2968) --- .../com/amazonaws/services/iot/AWSIot.java | 51 +-- .../amazonaws/services/iot/AWSIotClient.java | 51 +-- .../model/AttachPrincipalPolicyRequest.java | 3 +- .../iot/model/CACertificateDescription.java | 200 +++++++++++- .../services/iot/model/Certificate.java | 181 +++++++++++ .../iot/model/CertificateDescription.java | 241 ++++++++++++++ .../CreateProvisioningTemplateRequest.java | 291 +++++++++++++---- .../CreateProvisioningTemplateResult.java | 28 +- ...ateProvisioningTemplateVersionRequest.java | 32 +- ...eateProvisioningTemplateVersionResult.java | 50 +-- .../DeleteProvisioningTemplateRequest.java | 2 +- ...eteProvisioningTemplateVersionRequest.java | 30 +- .../DescribeProvisioningTemplateRequest.java | 16 +- .../DescribeProvisioningTemplateResult.java | 286 +++++++++++++---- ...ibeProvisioningTemplateVersionRequest.java | 16 +- ...ribeProvisioningTemplateVersionResult.java | 66 ++-- .../model/DetachPrincipalPolicyRequest.java | 6 +- .../services/iot/model/IndexingFilter.java | 196 ++++++++++++ .../com/amazonaws/services/iot/model/Job.java | 56 +++- .../services/iot/model/JobSummary.java | 56 +++- .../iot/model/ListCACertificatesRequest.java | 79 ++++- .../model/ListPolicyPrincipalsRequest.java | 5 +- .../model/ListPrincipalPoliciesRequest.java | 5 +- ...stProvisioningTemplateVersionsRequest.java | 16 +- ...istProvisioningTemplateVersionsResult.java | 18 +- .../ListProvisioningTemplatesRequest.java | 2 +- .../ListProvisioningTemplatesResult.java | 18 +- .../iot/model/PresignedUrlConfig.java | 63 ++++ .../model/ProvisioningTemplateSummary.java | 251 ++++++++++++--- .../ProvisioningTemplateVersionSummary.java | 38 ++- .../model/RegisterCACertificateRequest.java | 300 +++++++++++++++++- .../iot/model/RegisterCertificateRequest.java | 4 +- .../iot/model/RegistrationConfig.java | 79 ++++- .../iot/model/SearchIndexRequest.java | 35 +- .../services/iot/model/TemplateType.java | 62 ++++ .../iot/model/ThingIndexingConfiguration.java | 92 +++++- .../UpdateProvisioningTemplateRequest.java | 50 ++- ...ACertificateDescriptionJsonMarshaller.java | 5 + ...ertificateDescriptionJsonUnmarshaller.java | 3 + ...ProvisioningTemplateRequestMarshaller.java | 5 + ...sioningTemplateResultJsonUnmarshaller.java | 3 + .../IndexingFilterJsonMarshaller.java | 50 +++ .../IndexingFilterJsonUnmarshaller.java | 59 ++++ .../ListCACertificatesRequestMarshaller.java | 4 + ...isioningTemplateSummaryJsonMarshaller.java | 5 + ...ioningTemplateSummaryJsonUnmarshaller.java | 3 + ...egisterCACertificateRequestMarshaller.java | 5 + .../RegistrationConfigJsonMarshaller.java | 5 + .../RegistrationConfigJsonUnmarshaller.java | 3 + ...ngIndexingConfigurationJsonMarshaller.java | 5 + ...IndexingConfigurationJsonUnmarshaller.java | 3 + 51 files changed, 2668 insertions(+), 465 deletions(-) create mode 100644 aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/IndexingFilter.java create mode 100644 aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/TemplateType.java create mode 100644 aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonMarshaller.java create mode 100644 aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonUnmarshaller.java diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIot.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIot.java index f19b75af32..49135a8464 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIot.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/AWSIot.java @@ -293,7 +293,8 @@ void attachPolicy(AttachPolicyRequest attachPolicyRequest) throws AmazonClientEx * other credential). *

*

- * Note: This action is deprecated. Please use AttachPolicy + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use AttachPolicy * instead. *

*

@@ -1281,7 +1282,7 @@ CreateProvisioningClaimResult createProvisioningClaim( /** *

- * Creates a fleet provisioning template. + * Creates a provisioning template. *

*

* Requires permission to access the - * Creates a new version of a fleet provisioning template. + * Creates a new version of a provisioning template. *

*

* Requires permission to access the - * Deletes a fleet provisioning template. + * Deletes a provisioning template. *

*

* Requires permission to access the - * Deletes a fleet provisioning template version. + * Deletes a provisioning template version. *

*

* Requires permission to access the - * Returns information about a fleet provisioning template. + * Returns information about a provisioning template. *

*

* Requires permission to access the - * Returns information about a fleet provisioning template version. + * Returns information about a provisioning template version. *

*

* Requires permission to access the * Removes the specified policy from the specified certificate. *

- * *

- * This action is deprecated. Please use DetachPolicy instead. + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use DetachPolicy + * instead. *

- * *

* Requires permission to access the *

- * Note: This action is deprecated. Please use + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use * ListTargetsForPolicy instead. *

*

@@ -5281,7 +5283,8 @@ ListPolicyVersionsResult listPolicyVersions(ListPolicyVersionsRequest listPolicy * >AmazonCognito Identity format. *

*

- * Note: This action is deprecated. Please use + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use * ListAttachedPolicies instead. *

*

@@ -5351,7 +5354,7 @@ ListPrincipalThingsResult listPrincipalThings( /** *

- * A list of fleet provisioning template versions. + * A list of provisioning template versions. *

*

* Requires permission to access the - * Lists the fleet provisioning templates in your Amazon Web Services - * account. + * Lists the provisioning templates in your Amazon Web Services account. *

*

* Requires permission to access the - * Registers a CA certificate with IoT. This CA certificate can then be used - * to sign device certificates, which can be then registered with IoT. You - * can register up to 10 CA certificates per Amazon Web Services account - * that have the same subject field. This enables you to have up to 10 - * certificate authorities sign your device certificates. If you have more - * than one CA certificate registered, make sure you pass the CA certificate - * when you register your device certificates with the - * RegisterCertificate action. + * Registers a CA certificate with Amazon Web Services IoT Core. There is no + * limit to the number of CA certificates you can register in your Amazon + * Web Services account. You can register up to 10 CA certificates with the + * same CA subject field per Amazon Web Services account. *

*

* Requires permission to access the * @return registerCACertificateResult The response from the * RegisterCACertificate service method, as returned by AWS IoT. + * @throws ResourceNotFoundException * @throws ResourceAlreadyExistsException * @throws RegistrationCodeValidationException * @throws InvalidRequestException @@ -6123,7 +6122,9 @@ RegisterCACertificateResult registerCACertificate( /** *

- * Registers a device certificate with IoT. If you have more than one CA + * Registers a device certificate with IoT in the same certificate mode as the signing CA. If you have more than one CA * certificate that has the same subject field, you must specify the CA * certificate that was used to sign the device certificate being * registered. @@ -7339,7 +7340,7 @@ UpdateMitigationActionResult updateMitigationAction( /** *

- * Updates a fleet provisioning template. + * Updates a provisioning template. *

*

* Requires permission to access the *

- * Note: This action is deprecated. Please use AttachPolicy + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use AttachPolicy * instead. *

*

@@ -2434,7 +2435,7 @@ public CreateProvisioningClaimResult createProvisioningClaim( /** *

- * Creates a fleet provisioning template. + * Creates a provisioning template. *

*

* Requires permission to access the - * Creates a new version of a fleet provisioning template. + * Creates a new version of a provisioning template. *

*

* Requires permission to access the - * Deletes a fleet provisioning template. + * Deletes a provisioning template. *

*

* Requires permission to access the - * Deletes a fleet provisioning template version. + * Deletes a provisioning template version. *

*

* Requires permission to access the - * Returns information about a fleet provisioning template. + * Returns information about a provisioning template. *

*

* Requires permission to access the - * Returns information about a fleet provisioning template version. + * Returns information about a provisioning template version. *

*

* Requires permission to access the * Removes the specified policy from the specified certificate. *

- * *

- * This action is deprecated. Please use DetachPolicy instead. + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use DetachPolicy + * instead. *

- * *

* Requires permission to access the *

- * Note: This action is deprecated. Please use + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use * ListTargetsForPolicy instead. *

*

@@ -9818,7 +9820,8 @@ public ListPolicyVersionsResult listPolicyVersions( * >AmazonCognito Identity format. *

*

- * Note: This action is deprecated. Please use + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use * ListAttachedPolicies instead. *

*

@@ -9942,7 +9945,7 @@ public ListPrincipalThingsResult listPrincipalThings( /** *

- * A list of fleet provisioning template versions. + * A list of provisioning template versions. *

*

* Requires permission to access the - * Lists the fleet provisioning templates in your Amazon Web Services - * account. + * Lists the provisioning templates in your Amazon Web Services account. *

*

* Requires permission to access the - * Registers a CA certificate with IoT. This CA certificate can then be used - * to sign device certificates, which can be then registered with IoT. You - * can register up to 10 CA certificates per Amazon Web Services account - * that have the same subject field. This enables you to have up to 10 - * certificate authorities sign your device certificates. If you have more - * than one CA certificate registered, make sure you pass the CA certificate - * when you register your device certificates with the - * RegisterCertificate action. + * Registers a CA certificate with Amazon Web Services IoT Core. There is no + * limit to the number of CA certificates you can register in your Amazon + * Web Services account. You can register up to 10 CA certificates with the + * same CA subject field per Amazon Web Services account. *

*

* Requires permission to access the * @return registerCACertificateResult The response from the * RegisterCACertificate service method, as returned by AWS IoT. + * @throws ResourceNotFoundException * @throws ResourceAlreadyExistsException * @throws RegistrationCodeValidationException * @throws InvalidRequestException @@ -11383,7 +11382,9 @@ public RegisterCACertificateResult registerCACertificate( /** *

- * Registers a device certificate with IoT. If you have more than one CA + * Registers a device certificate with IoT in the same certificate mode as the signing CA. If you have more than one CA * certificate that has the same subject field, you must specify the CA * certificate that was used to sign the device certificate being * registered. @@ -13572,7 +13573,7 @@ public UpdateMitigationActionResult updateMitigationAction( /** *

- * Updates a fleet provisioning template. + * Updates a provisioning template. *

*

* Requires permission to access the *

- * Note: This action is deprecated. Please use AttachPolicy + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use AttachPolicy * instead. *

*

diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CACertificateDescription.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CACertificateDescription.java index 872f8dea1a..670ebdf713 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CACertificateDescription.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CACertificateDescription.java @@ -122,6 +122,23 @@ public class CACertificateDescription implements Serializable { */ private CertificateValidity validity; + /** + *

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA will be + * registered in the same mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + */ + private String certificateMode; + /** *

* The CA certificate ARN. @@ -777,6 +794,178 @@ public CACertificateDescription withValidity(CertificateValidity validity) { return this; } + /** + *

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA will be + * registered in the same mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @return

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA + * will be registered in the same mode as the CA. For more + * information about certificate mode for device certificates, see + * certificate mode. + *

+ * @see CertificateMode + */ + public String getCertificateMode() { + return certificateMode; + } + + /** + *

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA will be + * registered in the same mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA + * will be registered in the same mode as the CA. For more + * information about certificate mode for device certificates, + * see certificate mode. + *

+ * @see CertificateMode + */ + public void setCertificateMode(String certificateMode) { + this.certificateMode = certificateMode; + } + + /** + *

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA will be + * registered in the same mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA + * will be registered in the same mode as the CA. For more + * information about certificate mode for device certificates, + * see certificate mode. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see CertificateMode + */ + public CACertificateDescription withCertificateMode(String certificateMode) { + this.certificateMode = certificateMode; + return this; + } + + /** + *

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA will be + * registered in the same mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA + * will be registered in the same mode as the CA. For more + * information about certificate mode for device certificates, + * see certificate mode. + *

+ * @see CertificateMode + */ + public void setCertificateMode(CertificateMode certificateMode) { + this.certificateMode = certificateMode.toString(); + } + + /** + *

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA will be + * registered in the same mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * The mode of the CA. + *

+ *

+ * All the device certificates that are registered using this CA + * will be registered in the same mode as the CA. For more + * information about certificate mode for device certificates, + * see certificate mode. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see CertificateMode + */ + public CACertificateDescription withCertificateMode(CertificateMode certificateMode) { + this.certificateMode = certificateMode.toString(); + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -809,7 +998,9 @@ public String toString() { if (getGenerationId() != null) sb.append("generationId: " + getGenerationId() + ","); if (getValidity() != null) - sb.append("validity: " + getValidity()); + sb.append("validity: " + getValidity() + ","); + if (getCertificateMode() != null) + sb.append("certificateMode: " + getCertificateMode()); sb.append("}"); return sb.toString(); } @@ -840,6 +1031,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getGenerationId() == null) ? 0 : getGenerationId().hashCode()); hashCode = prime * hashCode + ((getValidity() == null) ? 0 : getValidity().hashCode()); + hashCode = prime * hashCode + + ((getCertificateMode() == null) ? 0 : getCertificateMode().hashCode()); return hashCode; } @@ -906,6 +1099,11 @@ public boolean equals(Object obj) { return false; if (other.getValidity() != null && other.getValidity().equals(this.getValidity()) == false) return false; + if (other.getCertificateMode() == null ^ this.getCertificateMode() == null) + return false; + if (other.getCertificateMode() != null + && other.getCertificateMode().equals(this.getCertificateMode()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Certificate.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Certificate.java index 21749a1a3c..a6d95b8664 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Certificate.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Certificate.java @@ -61,6 +61,22 @@ public class Certificate implements Serializable { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY */ @@ -323,12 +339,45 @@ public Certificate withStatus(CertificateStatus status) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY * * @return

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT mode + * is either generated by Amazon Web Services IoT Core or registered + * with an issuer certificate authority (CA) in DEFAULT + * mode. Devices with certificates in DEFAULT mode + * aren't required to send the Server Name Indication (SNI) + * extension when connecting to Amazon Web Services IoT Core. + * However, to use features such as custom domains and VPC + * endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

* @see CertificateMode */ public String getCertificateMode() { @@ -340,12 +389,45 @@ public String getCertificateMode() { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY * * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

* @see CertificateMode */ public void setCertificateMode(String certificateMode) { @@ -357,6 +439,22 @@ public void setCertificateMode(String certificateMode) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

* Returns a reference to this object so that method calls can be chained * together. *

@@ -366,6 +464,23 @@ public void setCertificateMode(String certificateMode) { * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

* @return A reference to this updated object so that method calls can be * chained together. * @see CertificateMode @@ -380,12 +495,45 @@ public Certificate withCertificateMode(String certificateMode) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY * * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

* @see CertificateMode */ public void setCertificateMode(CertificateMode certificateMode) { @@ -397,6 +545,22 @@ public void setCertificateMode(CertificateMode certificateMode) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

* Returns a reference to this object so that method calls can be chained * together. *

@@ -406,6 +570,23 @@ public void setCertificateMode(CertificateMode certificateMode) { * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

* @return A reference to this updated object so that method calls can be * chained together. * @see CertificateMode diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CertificateDescription.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CertificateDescription.java index 9288923573..61c6aa611d 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CertificateDescription.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CertificateDescription.java @@ -147,6 +147,27 @@ public class CertificateDescription implements Serializable { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY */ @@ -880,12 +901,56 @@ public CertificateDescription withValidity(CertificateValidity validity) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY * * @return

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT mode + * is either generated by Amazon Web Services IoT Core or registered + * with an issuer certificate authority (CA) in DEFAULT + * mode. Devices with certificates in DEFAULT mode + * aren't required to send the Server Name Indication (SNI) + * extension when connecting to Amazon Web Services IoT Core. + * However, to use features such as custom domains and VPC + * endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

* @see CertificateMode */ public String getCertificateMode() { @@ -897,12 +962,56 @@ public String getCertificateMode() { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY * * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

* @see CertificateMode */ public void setCertificateMode(String certificateMode) { @@ -914,6 +1023,27 @@ public void setCertificateMode(String certificateMode) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

+ *

* Returns a reference to this object so that method calls can be chained * together. *

@@ -923,6 +1053,29 @@ public void setCertificateMode(String certificateMode) { * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

* @return A reference to this updated object so that method calls can be * chained together. * @see CertificateMode @@ -937,12 +1090,56 @@ public CertificateDescription withCertificateMode(String certificateMode) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

+ *

* Constraints:
* Allowed Values: DEFAULT, SNI_ONLY * * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

* @see CertificateMode */ public void setCertificateMode(CertificateMode certificateMode) { @@ -954,6 +1151,27 @@ public void setCertificateMode(CertificateMode certificateMode) { * The mode of the certificate. *

*

+ * DEFAULT: A certificate in DEFAULT mode is + * either generated by Amazon Web Services IoT Core or registered with an + * issuer certificate authority (CA) in DEFAULT mode. Devices + * with certificates in DEFAULT mode aren't required to send + * the Server Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom domains and + * VPC endpoints, we recommend that you use the SNI extension when + * connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY mode is + * registered without an issuer CA. Devices with certificates in + * SNI_ONLY mode must send the SNI extension when connecting to + * Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

+ *

* Returns a reference to this object so that method calls can be chained * together. *

@@ -963,6 +1181,29 @@ public void setCertificateMode(CertificateMode certificateMode) { * @param certificateMode

* The mode of the certificate. *

+ *

+ * DEFAULT: A certificate in DEFAULT + * mode is either generated by Amazon Web Services IoT Core or + * registered with an issuer certificate authority (CA) in + * DEFAULT mode. Devices with certificates in + * DEFAULT mode aren't required to send the Server + * Name Indication (SNI) extension when connecting to Amazon Web + * Services IoT Core. However, to use features such as custom + * domains and VPC endpoints, we recommend that you use the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * SNI_ONLY: A certificate in SNI_ONLY + * mode is registered without an issuer CA. Devices with + * certificates in SNI_ONLY mode must send the SNI + * extension when connecting to Amazon Web Services IoT Core. + *

+ *

+ * For more information about the value for SNI extension, see Transport security in IoT. + *

* @return A reference to this updated object so that method calls can be * chained together. * @see CertificateMode diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateRequest.java index 89b6a1e76e..e3b7aeba8e 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateRequest.java @@ -21,7 +21,7 @@ /** *

- * Creates a fleet provisioning template. + * Creates a provisioning template. *

*

* Requires permission to access the - * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -44,7 +44,7 @@ public class CreateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -55,7 +55,7 @@ public class CreateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -66,15 +66,15 @@ public class CreateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*/ private Boolean enabled; /** *

- * The role ARN for the role associated with the fleet provisioning - * template. This IoT role grants permission to provision a device. + * The role ARN for the role associated with the provisioning template. This + * IoT role grants permission to provision a device. *

*

* Constraints:
@@ -91,7 +91,7 @@ public class CreateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * Metadata which can be used to manage the fleet provisioning template. + * Metadata which can be used to manage the provisioning template. *

* *

@@ -111,7 +111,22 @@ public class CreateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * The name of the fleet provisioning template. + * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + */ + private String type; + + /** + *

+ * The name of the provisioning template. *

*

* Constraints:
@@ -119,7 +134,7 @@ public class CreateProvisioningTemplateRequest extends AmazonWebServiceRequest i * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -128,7 +143,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -136,7 +151,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -145,7 +160,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -156,7 +171,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -168,7 +183,7 @@ public CreateProvisioningTemplateRequest withTemplateName(String templateName) { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -176,7 +191,7 @@ public CreateProvisioningTemplateRequest withTemplateName(String templateName) { * Pattern: [^\p{C}]*
* * @return

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public String getDescription() { @@ -185,7 +200,7 @@ public String getDescription() { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -193,7 +208,7 @@ public String getDescription() { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public void setDescription(String description) { @@ -202,7 +217,7 @@ public void setDescription(String description) { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -213,7 +228,7 @@ public void setDescription(String description) { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -225,7 +240,7 @@ public CreateProvisioningTemplateRequest withDescription(String description) { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -233,7 +248,7 @@ public CreateProvisioningTemplateRequest withDescription(String description) { * Pattern: [\s\S]*
* * @return

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*/ public String getTemplateBody() { @@ -242,7 +257,7 @@ public String getTemplateBody() { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -250,8 +265,7 @@ public String getTemplateBody() { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning - * template. + * The JSON formatted contents of the provisioning template. *

*/ public void setTemplateBody(String templateBody) { @@ -260,7 +274,7 @@ public void setTemplateBody(String templateBody) { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -271,8 +285,7 @@ public void setTemplateBody(String templateBody) { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning - * template. + * The JSON formatted contents of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -284,11 +297,11 @@ public CreateProvisioningTemplateRequest withTemplateBody(String templateBody) { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

* * @return

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*/ public Boolean isEnabled() { @@ -297,11 +310,11 @@ public Boolean isEnabled() { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

* * @return

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*/ public Boolean getEnabled() { @@ -310,12 +323,11 @@ public Boolean getEnabled() { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

* * @param enabled

- * True to enable the fleet provisioning template, otherwise - * false. + * True to enable the provisioning template, otherwise false. *

*/ public void setEnabled(Boolean enabled) { @@ -324,15 +336,14 @@ public void setEnabled(Boolean enabled) { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param enabled

- * True to enable the fleet provisioning template, otherwise - * false. + * True to enable the provisioning template, otherwise false. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -344,15 +355,15 @@ public CreateProvisioningTemplateRequest withEnabled(Boolean enabled) { /** *

- * The role ARN for the role associated with the fleet provisioning - * template. This IoT role grants permission to provision a device. + * The role ARN for the role associated with the provisioning template. This + * IoT role grants permission to provision a device. *

*

* Constraints:
* Length: 20 - 2048
* * @return

- * The role ARN for the role associated with the fleet provisioning + * The role ARN for the role associated with the provisioning * template. This IoT role grants permission to provision a device. *

*/ @@ -362,17 +373,17 @@ public String getProvisioningRoleArn() { /** *

- * The role ARN for the role associated with the fleet provisioning - * template. This IoT role grants permission to provision a device. + * The role ARN for the role associated with the provisioning template. This + * IoT role grants permission to provision a device. *

*

* Constraints:
* Length: 20 - 2048
* * @param provisioningRoleArn

- * The role ARN for the role associated with the fleet - * provisioning template. This IoT role grants permission to - * provision a device. + * The role ARN for the role associated with the provisioning + * template. This IoT role grants permission to provision a + * device. *

*/ public void setProvisioningRoleArn(String provisioningRoleArn) { @@ -381,8 +392,8 @@ public void setProvisioningRoleArn(String provisioningRoleArn) { /** *

- * The role ARN for the role associated with the fleet provisioning - * template. This IoT role grants permission to provision a device. + * The role ARN for the role associated with the provisioning template. This + * IoT role grants permission to provision a device. *

*

* Returns a reference to this object so that method calls can be chained @@ -392,9 +403,9 @@ public void setProvisioningRoleArn(String provisioningRoleArn) { * Length: 20 - 2048
* * @param provisioningRoleArn

- * The role ARN for the role associated with the fleet - * provisioning template. This IoT role grants permission to - * provision a device. + * The role ARN for the role associated with the provisioning + * template. This IoT role grants permission to provision a + * device. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -452,7 +463,7 @@ public CreateProvisioningTemplateRequest withPreProvisioningHook( /** *

- * Metadata which can be used to manage the fleet provisioning template. + * Metadata which can be used to manage the provisioning template. *

* *

@@ -469,8 +480,7 @@ public CreateProvisioningTemplateRequest withPreProvisioningHook( * * * @return

- * Metadata which can be used to manage the fleet provisioning - * template. + * Metadata which can be used to manage the provisioning template. *

* *

@@ -493,7 +503,7 @@ public java.util.List getTags() { /** *

- * Metadata which can be used to manage the fleet provisioning template. + * Metadata which can be used to manage the provisioning template. *

* *

@@ -510,7 +520,7 @@ public java.util.List getTags() { * * * @param tags

- * Metadata which can be used to manage the fleet provisioning + * Metadata which can be used to manage the provisioning * template. *

* @@ -539,7 +549,7 @@ public void setTags(java.util.Collection tags) { /** *

- * Metadata which can be used to manage the fleet provisioning template. + * Metadata which can be used to manage the provisioning template. *

* *

@@ -559,7 +569,7 @@ public void setTags(java.util.Collection tags) { * together. * * @param tags

- * Metadata which can be used to manage the fleet provisioning + * Metadata which can be used to manage the provisioning * template. *

* @@ -591,7 +601,7 @@ public CreateProvisioningTemplateRequest withTags(Tag... tags) { /** *

- * Metadata which can be used to manage the fleet provisioning template. + * Metadata which can be used to manage the provisioning template. *

* *

@@ -611,7 +621,7 @@ public CreateProvisioningTemplateRequest withTags(Tag... tags) { * together. * * @param tags

- * Metadata which can be used to manage the fleet provisioning + * Metadata which can be used to manage the provisioning * template. *

* @@ -636,6 +646,158 @@ public CreateProvisioningTemplateRequest withTags(java.util.Collection tags return this; } + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @return

+ * The type you define in a provisioning template. You can create a + * template with only one type. You can't change the template type + * after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public String getType() { + return type; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public void setType(String type) { + this.type = type; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see TemplateType + */ + public CreateProvisioningTemplateRequest withType(String type) { + this.type = type; + return this; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public void setType(TemplateType type) { + this.type = type.toString(); + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see TemplateType + */ + public CreateProvisioningTemplateRequest withType(TemplateType type) { + this.type = type.toString(); + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -660,7 +822,9 @@ public String toString() { if (getPreProvisioningHook() != null) sb.append("preProvisioningHook: " + getPreProvisioningHook() + ","); if (getTags() != null) - sb.append("tags: " + getTags()); + sb.append("tags: " + getTags() + ","); + if (getType() != null) + sb.append("type: " + getType()); sb.append("}"); return sb.toString(); } @@ -682,6 +846,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getPreProvisioningHook() == null) ? 0 : getPreProvisioningHook().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); + hashCode = prime * hashCode + ((getType() == null) ? 0 : getType().hashCode()); return hashCode; } @@ -729,6 +894,10 @@ public boolean equals(Object obj) { return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) return false; + if (other.getType() == null ^ this.getType() == null) + return false; + if (other.getType() != null && other.getType().equals(this.getType()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateResult.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateResult.java index d270c5a2ea..654e16a62b 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateResult.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateResult.java @@ -27,7 +27,7 @@ public class CreateProvisioningTemplateResult implements Serializable { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -38,7 +38,7 @@ public class CreateProvisioningTemplateResult implements Serializable { /** *

- * The default version of the fleet provisioning template. + * The default version of the provisioning template. *

*/ private Integer defaultVersionId; @@ -90,7 +90,7 @@ public CreateProvisioningTemplateResult withTemplateArn(String templateArn) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -98,7 +98,7 @@ public CreateProvisioningTemplateResult withTemplateArn(String templateArn) { * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -107,7 +107,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -115,7 +115,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -124,7 +124,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -135,7 +135,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -147,11 +147,11 @@ public CreateProvisioningTemplateResult withTemplateName(String templateName) { /** *

- * The default version of the fleet provisioning template. + * The default version of the provisioning template. *

* * @return

- * The default version of the fleet provisioning template. + * The default version of the provisioning template. *

*/ public Integer getDefaultVersionId() { @@ -160,11 +160,11 @@ public Integer getDefaultVersionId() { /** *

- * The default version of the fleet provisioning template. + * The default version of the provisioning template. *

* * @param defaultVersionId

- * The default version of the fleet provisioning template. + * The default version of the provisioning template. *

*/ public void setDefaultVersionId(Integer defaultVersionId) { @@ -173,14 +173,14 @@ public void setDefaultVersionId(Integer defaultVersionId) { /** *

- * The default version of the fleet provisioning template. + * The default version of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param defaultVersionId

- * The default version of the fleet provisioning template. + * The default version of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionRequest.java index 19cb1ed321..649e20a6b0 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionRequest.java @@ -21,7 +21,7 @@ /** *

- * Creates a new version of a fleet provisioning template. + * Creates a new version of a provisioning template. *

*

* Requires permission to access the - * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -44,7 +44,7 @@ public class CreateProvisioningTemplateVersionRequest extends AmazonWebServiceRe /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -62,7 +62,7 @@ public class CreateProvisioningTemplateVersionRequest extends AmazonWebServiceRe /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -70,7 +70,7 @@ public class CreateProvisioningTemplateVersionRequest extends AmazonWebServiceRe * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -79,7 +79,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -87,7 +87,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -96,7 +96,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -107,7 +107,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -119,7 +119,7 @@ public CreateProvisioningTemplateVersionRequest withTemplateName(String template /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -127,7 +127,7 @@ public CreateProvisioningTemplateVersionRequest withTemplateName(String template * Pattern: [\s\S]*
* * @return

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*/ public String getTemplateBody() { @@ -136,7 +136,7 @@ public String getTemplateBody() { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -144,8 +144,7 @@ public String getTemplateBody() { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning - * template. + * The JSON formatted contents of the provisioning template. *

*/ public void setTemplateBody(String templateBody) { @@ -154,7 +153,7 @@ public void setTemplateBody(String templateBody) { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -165,8 +164,7 @@ public void setTemplateBody(String templateBody) { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning - * template. + * The JSON formatted contents of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionResult.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionResult.java index 37db9381f3..81e0ceccd8 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionResult.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/CreateProvisioningTemplateVersionResult.java @@ -27,7 +27,7 @@ public class CreateProvisioningTemplateVersionResult implements Serializable { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -38,14 +38,14 @@ public class CreateProvisioningTemplateVersionResult implements Serializable { /** *

- * The version of the fleet provisioning template. + * The version of the provisioning template. *

*/ private Integer versionId; /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

*/ @@ -98,7 +98,7 @@ public CreateProvisioningTemplateVersionResult withTemplateArn(String templateAr /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -106,7 +106,7 @@ public CreateProvisioningTemplateVersionResult withTemplateArn(String templateAr * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -115,7 +115,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -123,7 +123,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -132,7 +132,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -143,7 +143,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -155,11 +155,11 @@ public CreateProvisioningTemplateVersionResult withTemplateName(String templateN /** *

- * The version of the fleet provisioning template. + * The version of the provisioning template. *

* * @return

- * The version of the fleet provisioning template. + * The version of the provisioning template. *

*/ public Integer getVersionId() { @@ -168,11 +168,11 @@ public Integer getVersionId() { /** *

- * The version of the fleet provisioning template. + * The version of the provisioning template. *

* * @param versionId

- * The version of the fleet provisioning template. + * The version of the provisioning template. *

*/ public void setVersionId(Integer versionId) { @@ -181,14 +181,14 @@ public void setVersionId(Integer versionId) { /** *

- * The version of the fleet provisioning template. + * The version of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param versionId

- * The version of the fleet provisioning template. + * The version of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -200,13 +200,13 @@ public CreateProvisioningTemplateVersionResult withVersionId(Integer versionId) /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

* * @return

- * True if the fleet provisioning template version is the default - * version, otherwise false. + * True if the provisioning template version is the default version, + * otherwise false. *

*/ public Boolean isIsDefaultVersion() { @@ -215,13 +215,13 @@ public Boolean isIsDefaultVersion() { /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

* * @return

- * True if the fleet provisioning template version is the default - * version, otherwise false. + * True if the provisioning template version is the default version, + * otherwise false. *

*/ public Boolean getIsDefaultVersion() { @@ -230,12 +230,12 @@ public Boolean getIsDefaultVersion() { /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

* * @param isDefaultVersion

- * True if the fleet provisioning template version is the default + * True if the provisioning template version is the default * version, otherwise false. *

*/ @@ -245,7 +245,7 @@ public void setIsDefaultVersion(Boolean isDefaultVersion) { /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

*

@@ -253,7 +253,7 @@ public void setIsDefaultVersion(Boolean isDefaultVersion) { * together. * * @param isDefaultVersion

- * True if the fleet provisioning template version is the default + * True if the provisioning template version is the default * version, otherwise false. *

* @return A reference to this updated object so that method calls can be diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DeleteProvisioningTemplateRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DeleteProvisioningTemplateRequest.java index 02822323c1..f5226e86d4 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DeleteProvisioningTemplateRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DeleteProvisioningTemplateRequest.java @@ -21,7 +21,7 @@ /** *

- * Deletes a fleet provisioning template. + * Deletes a provisioning template. *

*

* Requires permission to access the - * Deletes a fleet provisioning template version. + * Deletes a provisioning template version. *

*

* Requires permission to access the - * The name of the fleet provisioning template version to delete. + * The name of the provisioning template version to delete. *

*

* Constraints:
@@ -44,14 +44,14 @@ public class DeleteProvisioningTemplateVersionRequest extends AmazonWebServiceRe /** *

- * The fleet provisioning template version ID to delete. + * The provisioning template version ID to delete. *

*/ private Integer versionId; /** *

- * The name of the fleet provisioning template version to delete. + * The name of the provisioning template version to delete. *

*

* Constraints:
@@ -59,7 +59,7 @@ public class DeleteProvisioningTemplateVersionRequest extends AmazonWebServiceRe * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template version to delete. + * The name of the provisioning template version to delete. *

*/ public String getTemplateName() { @@ -68,7 +68,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template version to delete. + * The name of the provisioning template version to delete. *

*

* Constraints:
@@ -76,7 +76,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template version to delete. + * The name of the provisioning template version to delete. *

*/ public void setTemplateName(String templateName) { @@ -85,7 +85,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template version to delete. + * The name of the provisioning template version to delete. *

*

* Returns a reference to this object so that method calls can be chained @@ -96,7 +96,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template version to delete. + * The name of the provisioning template version to delete. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -108,11 +108,11 @@ public DeleteProvisioningTemplateVersionRequest withTemplateName(String template /** *

- * The fleet provisioning template version ID to delete. + * The provisioning template version ID to delete. *

* * @return

- * The fleet provisioning template version ID to delete. + * The provisioning template version ID to delete. *

*/ public Integer getVersionId() { @@ -121,11 +121,11 @@ public Integer getVersionId() { /** *

- * The fleet provisioning template version ID to delete. + * The provisioning template version ID to delete. *

* * @param versionId

- * The fleet provisioning template version ID to delete. + * The provisioning template version ID to delete. *

*/ public void setVersionId(Integer versionId) { @@ -134,14 +134,14 @@ public void setVersionId(Integer versionId) { /** *

- * The fleet provisioning template version ID to delete. + * The provisioning template version ID to delete. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param versionId

- * The fleet provisioning template version ID to delete. + * The provisioning template version ID to delete. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateRequest.java index b8274430fe..48fc7eb1bc 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateRequest.java @@ -21,7 +21,7 @@ /** *

- * Returns information about a fleet provisioning template. + * Returns information about a provisioning template. *

*

* Requires permission to access the - * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -44,7 +44,7 @@ public class DescribeProvisioningTemplateRequest extends AmazonWebServiceRequest /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -52,7 +52,7 @@ public class DescribeProvisioningTemplateRequest extends AmazonWebServiceRequest * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -61,7 +61,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -69,7 +69,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -78,7 +78,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -89,7 +89,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateResult.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateResult.java index 96f1a80a52..9a7e8d7042 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateResult.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateResult.java @@ -20,14 +20,14 @@ public class DescribeProvisioningTemplateResult implements Serializable { /** *

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*/ private String templateArn; /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -38,7 +38,7 @@ public class DescribeProvisioningTemplateResult implements Serializable { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -49,14 +49,14 @@ public class DescribeProvisioningTemplateResult implements Serializable { /** *

- * The date when the fleet provisioning template was created. + * The date when the provisioning template was created. *

*/ private java.util.Date creationDate; /** *

- * The date when the fleet provisioning template was last modified. + * The date when the provisioning template was last modified. *

*/ private java.util.Date lastModifiedDate; @@ -70,7 +70,7 @@ public class DescribeProvisioningTemplateResult implements Serializable { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -81,7 +81,7 @@ public class DescribeProvisioningTemplateResult implements Serializable { /** *

- * True if the fleet provisioning template is enabled, otherwise false. + * True if the provisioning template is enabled, otherwise false. *

*/ private Boolean enabled; @@ -106,11 +106,26 @@ public class DescribeProvisioningTemplateResult implements Serializable { /** *

- * The ARN of the fleet provisioning template. + * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + */ + private String type; + + /** + *

+ * The ARN of the provisioning template. *

* * @return

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*/ public String getTemplateArn() { @@ -119,11 +134,11 @@ public String getTemplateArn() { /** *

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

* * @param templateArn

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*/ public void setTemplateArn(String templateArn) { @@ -132,14 +147,14 @@ public void setTemplateArn(String templateArn) { /** *

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param templateArn

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -151,7 +166,7 @@ public DescribeProvisioningTemplateResult withTemplateArn(String templateArn) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -159,7 +174,7 @@ public DescribeProvisioningTemplateResult withTemplateArn(String templateArn) { * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -168,7 +183,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -176,7 +191,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -185,7 +200,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -196,7 +211,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -208,7 +223,7 @@ public DescribeProvisioningTemplateResult withTemplateName(String templateName) /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -216,7 +231,7 @@ public DescribeProvisioningTemplateResult withTemplateName(String templateName) * Pattern: [^\p{C}]*
* * @return

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public String getDescription() { @@ -225,7 +240,7 @@ public String getDescription() { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -233,7 +248,7 @@ public String getDescription() { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public void setDescription(String description) { @@ -242,7 +257,7 @@ public void setDescription(String description) { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -253,7 +268,7 @@ public void setDescription(String description) { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -265,11 +280,11 @@ public DescribeProvisioningTemplateResult withDescription(String description) { /** *

- * The date when the fleet provisioning template was created. + * The date when the provisioning template was created. *

* * @return

- * The date when the fleet provisioning template was created. + * The date when the provisioning template was created. *

*/ public java.util.Date getCreationDate() { @@ -278,11 +293,11 @@ public java.util.Date getCreationDate() { /** *

- * The date when the fleet provisioning template was created. + * The date when the provisioning template was created. *

* * @param creationDate

- * The date when the fleet provisioning template was created. + * The date when the provisioning template was created. *

*/ public void setCreationDate(java.util.Date creationDate) { @@ -291,14 +306,14 @@ public void setCreationDate(java.util.Date creationDate) { /** *

- * The date when the fleet provisioning template was created. + * The date when the provisioning template was created. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param creationDate

- * The date when the fleet provisioning template was created. + * The date when the provisioning template was created. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -310,11 +325,11 @@ public DescribeProvisioningTemplateResult withCreationDate(java.util.Date creati /** *

- * The date when the fleet provisioning template was last modified. + * The date when the provisioning template was last modified. *

* * @return

- * The date when the fleet provisioning template was last modified. + * The date when the provisioning template was last modified. *

*/ public java.util.Date getLastModifiedDate() { @@ -323,12 +338,11 @@ public java.util.Date getLastModifiedDate() { /** *

- * The date when the fleet provisioning template was last modified. + * The date when the provisioning template was last modified. *

* * @param lastModifiedDate

- * The date when the fleet provisioning template was last - * modified. + * The date when the provisioning template was last modified. *

*/ public void setLastModifiedDate(java.util.Date lastModifiedDate) { @@ -337,15 +351,14 @@ public void setLastModifiedDate(java.util.Date lastModifiedDate) { /** *

- * The date when the fleet provisioning template was last modified. + * The date when the provisioning template was last modified. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param lastModifiedDate

- * The date when the fleet provisioning template was last - * modified. + * The date when the provisioning template was last modified. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -402,7 +415,7 @@ public DescribeProvisioningTemplateResult withDefaultVersionId(Integer defaultVe /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -410,7 +423,7 @@ public DescribeProvisioningTemplateResult withDefaultVersionId(Integer defaultVe * Pattern: [\s\S]*
* * @return

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*/ public String getTemplateBody() { @@ -419,7 +432,7 @@ public String getTemplateBody() { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Constraints:
@@ -427,8 +440,7 @@ public String getTemplateBody() { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning - * template. + * The JSON formatted contents of the provisioning template. *

*/ public void setTemplateBody(String templateBody) { @@ -437,7 +449,7 @@ public void setTemplateBody(String templateBody) { /** *

- * The JSON formatted contents of the fleet provisioning template. + * The JSON formatted contents of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -448,8 +460,7 @@ public void setTemplateBody(String templateBody) { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning - * template. + * The JSON formatted contents of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -461,12 +472,11 @@ public DescribeProvisioningTemplateResult withTemplateBody(String templateBody) /** *

- * True if the fleet provisioning template is enabled, otherwise false. + * True if the provisioning template is enabled, otherwise false. *

* * @return

- * True if the fleet provisioning template is enabled, otherwise - * false. + * True if the provisioning template is enabled, otherwise false. *

*/ public Boolean isEnabled() { @@ -475,12 +485,11 @@ public Boolean isEnabled() { /** *

- * True if the fleet provisioning template is enabled, otherwise false. + * True if the provisioning template is enabled, otherwise false. *

* * @return

- * True if the fleet provisioning template is enabled, otherwise - * false. + * True if the provisioning template is enabled, otherwise false. *

*/ public Boolean getEnabled() { @@ -489,12 +498,11 @@ public Boolean getEnabled() { /** *

- * True if the fleet provisioning template is enabled, otherwise false. + * True if the provisioning template is enabled, otherwise false. *

* * @param enabled

- * True if the fleet provisioning template is enabled, otherwise - * false. + * True if the provisioning template is enabled, otherwise false. *

*/ public void setEnabled(Boolean enabled) { @@ -503,15 +511,14 @@ public void setEnabled(Boolean enabled) { /** *

- * True if the fleet provisioning template is enabled, otherwise false. + * True if the provisioning template is enabled, otherwise false. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param enabled

- * True if the fleet provisioning template is enabled, otherwise - * false. + * True if the provisioning template is enabled, otherwise false. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -627,6 +634,158 @@ public DescribeProvisioningTemplateResult withPreProvisioningHook( return this; } + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @return

+ * The type you define in a provisioning template. You can create a + * template with only one type. You can't change the template type + * after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public String getType() { + return type; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public void setType(String type) { + this.type = type; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see TemplateType + */ + public DescribeProvisioningTemplateResult withType(String type) { + this.type = type; + return this; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public void setType(TemplateType type) { + this.type = type.toString(); + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see TemplateType + */ + public DescribeProvisioningTemplateResult withType(TemplateType type) { + this.type = type.toString(); + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -657,7 +816,9 @@ public String toString() { if (getProvisioningRoleArn() != null) sb.append("provisioningRoleArn: " + getProvisioningRoleArn() + ","); if (getPreProvisioningHook() != null) - sb.append("preProvisioningHook: " + getPreProvisioningHook()); + sb.append("preProvisioningHook: " + getPreProvisioningHook() + ","); + if (getType() != null) + sb.append("type: " + getType()); sb.append("}"); return sb.toString(); } @@ -686,6 +847,7 @@ public int hashCode() { + ((getProvisioningRoleArn() == null) ? 0 : getProvisioningRoleArn().hashCode()); hashCode = prime * hashCode + ((getPreProvisioningHook() == null) ? 0 : getPreProvisioningHook().hashCode()); + hashCode = prime * hashCode + ((getType() == null) ? 0 : getType().hashCode()); return hashCode; } @@ -749,6 +911,10 @@ public boolean equals(Object obj) { if (other.getPreProvisioningHook() != null && other.getPreProvisioningHook().equals(this.getPreProvisioningHook()) == false) return false; + if (other.getType() == null ^ this.getType() == null) + return false; + if (other.getType() != null && other.getType().equals(this.getType()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionRequest.java index 8257400031..9fddc60f24 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionRequest.java @@ -21,7 +21,7 @@ /** *

- * Returns information about a fleet provisioning template version. + * Returns information about a provisioning template version. *

*

* Requires permission to access the - * The fleet provisioning template version ID. + * The provisioning template version ID. *

*/ private Integer versionId; @@ -108,11 +108,11 @@ public DescribeProvisioningTemplateVersionRequest withTemplateName(String templa /** *

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

* * @return

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

*/ public Integer getVersionId() { @@ -121,11 +121,11 @@ public Integer getVersionId() { /** *

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

* * @param versionId

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

*/ public void setVersionId(Integer versionId) { @@ -134,14 +134,14 @@ public void setVersionId(Integer versionId) { /** *

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param versionId

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionResult.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionResult.java index 0f59ebd325..902942a072 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionResult.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DescribeProvisioningTemplateVersionResult.java @@ -20,21 +20,21 @@ public class DescribeProvisioningTemplateVersionResult implements Serializable { /** *

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

*/ private Integer versionId; /** *

- * The date when the fleet provisioning template version was created. + * The date when the provisioning template version was created. *

*/ private java.util.Date creationDate; /** *

- * The JSON formatted contents of the fleet provisioning template version. + * The JSON formatted contents of the provisioning template version. *

*

* Constraints:
@@ -45,18 +45,18 @@ public class DescribeProvisioningTemplateVersionResult implements Serializable { /** *

- * True if the fleet provisioning template version is the default version. + * True if the provisioning template version is the default version. *

*/ private Boolean isDefaultVersion; /** *

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

* * @return

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

*/ public Integer getVersionId() { @@ -65,11 +65,11 @@ public Integer getVersionId() { /** *

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

* * @param versionId

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

*/ public void setVersionId(Integer versionId) { @@ -78,14 +78,14 @@ public void setVersionId(Integer versionId) { /** *

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param versionId

- * The fleet provisioning template version ID. + * The provisioning template version ID. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -97,12 +97,11 @@ public DescribeProvisioningTemplateVersionResult withVersionId(Integer versionId /** *

- * The date when the fleet provisioning template version was created. + * The date when the provisioning template version was created. *

* * @return

- * The date when the fleet provisioning template version was - * created. + * The date when the provisioning template version was created. *

*/ public java.util.Date getCreationDate() { @@ -111,12 +110,11 @@ public java.util.Date getCreationDate() { /** *

- * The date when the fleet provisioning template version was created. + * The date when the provisioning template version was created. *

* * @param creationDate

- * The date when the fleet provisioning template version was - * created. + * The date when the provisioning template version was created. *

*/ public void setCreationDate(java.util.Date creationDate) { @@ -125,15 +123,14 @@ public void setCreationDate(java.util.Date creationDate) { /** *

- * The date when the fleet provisioning template version was created. + * The date when the provisioning template version was created. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param creationDate

- * The date when the fleet provisioning template version was - * created. + * The date when the provisioning template version was created. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -145,7 +142,7 @@ public DescribeProvisioningTemplateVersionResult withCreationDate(java.util.Date /** *

- * The JSON formatted contents of the fleet provisioning template version. + * The JSON formatted contents of the provisioning template version. *

*

* Constraints:
@@ -153,8 +150,7 @@ public DescribeProvisioningTemplateVersionResult withCreationDate(java.util.Date * Pattern: [\s\S]*
* * @return

- * The JSON formatted contents of the fleet provisioning template - * version. + * The JSON formatted contents of the provisioning template version. *

*/ public String getTemplateBody() { @@ -163,7 +159,7 @@ public String getTemplateBody() { /** *

- * The JSON formatted contents of the fleet provisioning template version. + * The JSON formatted contents of the provisioning template version. *

*

* Constraints:
@@ -171,7 +167,7 @@ public String getTemplateBody() { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning template + * The JSON formatted contents of the provisioning template * version. *

*/ @@ -181,7 +177,7 @@ public void setTemplateBody(String templateBody) { /** *

- * The JSON formatted contents of the fleet provisioning template version. + * The JSON formatted contents of the provisioning template version. *

*

* Returns a reference to this object so that method calls can be chained @@ -192,7 +188,7 @@ public void setTemplateBody(String templateBody) { * Pattern: [\s\S]*
* * @param templateBody

- * The JSON formatted contents of the fleet provisioning template + * The JSON formatted contents of the provisioning template * version. *

* @return A reference to this updated object so that method calls can be @@ -205,12 +201,11 @@ public DescribeProvisioningTemplateVersionResult withTemplateBody(String templat /** *

- * True if the fleet provisioning template version is the default version. + * True if the provisioning template version is the default version. *

* * @return

- * True if the fleet provisioning template version is the default - * version. + * True if the provisioning template version is the default version. *

*/ public Boolean isIsDefaultVersion() { @@ -219,12 +214,11 @@ public Boolean isIsDefaultVersion() { /** *

- * True if the fleet provisioning template version is the default version. + * True if the provisioning template version is the default version. *

* * @return

- * True if the fleet provisioning template version is the default - * version. + * True if the provisioning template version is the default version. *

*/ public Boolean getIsDefaultVersion() { @@ -233,11 +227,11 @@ public Boolean getIsDefaultVersion() { /** *

- * True if the fleet provisioning template version is the default version. + * True if the provisioning template version is the default version. *

* * @param isDefaultVersion

- * True if the fleet provisioning template version is the default + * True if the provisioning template version is the default * version. *

*/ @@ -247,14 +241,14 @@ public void setIsDefaultVersion(Boolean isDefaultVersion) { /** *

- * True if the fleet provisioning template version is the default version. + * True if the provisioning template version is the default version. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param isDefaultVersion

- * True if the fleet provisioning template version is the default + * True if the provisioning template version is the default * version. *

* @return A reference to this updated object so that method calls can be diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DetachPrincipalPolicyRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DetachPrincipalPolicyRequest.java index 095d584d7b..c053a2ecb2 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DetachPrincipalPolicyRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/DetachPrincipalPolicyRequest.java @@ -23,11 +23,11 @@ *

* Removes the specified policy from the specified certificate. *

- * *

- * This action is deprecated. Please use DetachPolicy instead. + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use DetachPolicy + * instead. *

- * *

* Requires permission to access the + * Provides additional filters for specific data sources. Named shadow is the + * only data source that currently supports and requires a filter. To add named + * shadows to your fleet indexing configuration, set + * namedShadowIndexingMode to be ON and specify your + * shadow names in filter. + *

+ */ +public class IndexingFilter implements Serializable { + /** + *

+ * The shadow names that you select to index. The default maximum number of + * shadow names for indexing is 10. To increase the limit, see Amazon Web Services IoT Device Management Quotas in the Amazon + * Web Services General Reference. + *

+ */ + private java.util.List namedShadowNames; + + /** + *

+ * The shadow names that you select to index. The default maximum number of + * shadow names for indexing is 10. To increase the limit, see Amazon Web Services IoT Device Management Quotas in the Amazon + * Web Services General Reference. + *

+ * + * @return

+ * The shadow names that you select to index. The default maximum + * number of shadow names for indexing is 10. To increase the limit, + * see Amazon Web Services IoT Device Management Quotas in the + * Amazon Web Services General Reference. + *

+ */ + public java.util.List getNamedShadowNames() { + return namedShadowNames; + } + + /** + *

+ * The shadow names that you select to index. The default maximum number of + * shadow names for indexing is 10. To increase the limit, see Amazon Web Services IoT Device Management Quotas in the Amazon + * Web Services General Reference. + *

+ * + * @param namedShadowNames

+ * The shadow names that you select to index. The default maximum + * number of shadow names for indexing is 10. To increase the + * limit, see Amazon Web Services IoT Device Management Quotas in the + * Amazon Web Services General Reference. + *

+ */ + public void setNamedShadowNames(java.util.Collection namedShadowNames) { + if (namedShadowNames == null) { + this.namedShadowNames = null; + return; + } + + this.namedShadowNames = new java.util.ArrayList(namedShadowNames); + } + + /** + *

+ * The shadow names that you select to index. The default maximum number of + * shadow names for indexing is 10. To increase the limit, see Amazon Web Services IoT Device Management Quotas in the Amazon + * Web Services General Reference. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + * + * @param namedShadowNames

+ * The shadow names that you select to index. The default maximum + * number of shadow names for indexing is 10. To increase the + * limit, see Amazon Web Services IoT Device Management Quotas in the + * Amazon Web Services General Reference. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public IndexingFilter withNamedShadowNames(String... namedShadowNames) { + if (getNamedShadowNames() == null) { + this.namedShadowNames = new java.util.ArrayList(namedShadowNames.length); + } + for (String value : namedShadowNames) { + this.namedShadowNames.add(value); + } + return this; + } + + /** + *

+ * The shadow names that you select to index. The default maximum number of + * shadow names for indexing is 10. To increase the limit, see Amazon Web Services IoT Device Management Quotas in the Amazon + * Web Services General Reference. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + * + * @param namedShadowNames

+ * The shadow names that you select to index. The default maximum + * number of shadow names for indexing is 10. To increase the + * limit, see Amazon Web Services IoT Device Management Quotas in the + * Amazon Web Services General Reference. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public IndexingFilter withNamedShadowNames(java.util.Collection namedShadowNames) { + setNamedShadowNames(namedShadowNames); + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getNamedShadowNames() != null) + sb.append("namedShadowNames: " + getNamedShadowNames()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + + ((getNamedShadowNames() == null) ? 0 : getNamedShadowNames().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof IndexingFilter == false) + return false; + IndexingFilter other = (IndexingFilter) obj; + + if (other.getNamedShadowNames() == null ^ this.getNamedShadowNames() == null) + return false; + if (other.getNamedShadowNames() != null + && other.getNamedShadowNames().equals(this.getNamedShadowNames()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Job.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Job.java index 076b53effe..46e5c5c56c 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Job.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/Job.java @@ -245,7 +245,11 @@ public class Job implements Serializable { private java.util.Map documentParameters; /** - * The new value for the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

*/ private Boolean isConcurrent; @@ -1817,41 +1821,71 @@ public Job cleardocumentParametersEntries() { } /** - * Returns the value of the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

* - * @return The value of the isConcurrent property for this object. + * @return

+ * Indicates whether a job is concurrent. Will be true when a job is + * rolling out new job executions or canceling previously created + * executions, otherwise false. + *

*/ public Boolean isIsConcurrent() { return isConcurrent; } /** - * Returns the value of the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

* - * @return The value of the isConcurrent property for this object. + * @return

+ * Indicates whether a job is concurrent. Will be true when a job is + * rolling out new job executions or canceling previously created + * executions, otherwise false. + *

*/ public Boolean getIsConcurrent() { return isConcurrent; } /** - * Sets the value of isConcurrent + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

* - * @param isConcurrent The new value for the isConcurrent property for this - * object. + * @param isConcurrent

+ * Indicates whether a job is concurrent. Will be true when a job + * is rolling out new job executions or canceling previously + * created executions, otherwise false. + *

*/ public void setIsConcurrent(Boolean isConcurrent) { this.isConcurrent = isConcurrent; } /** - * Sets the value of the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param isConcurrent The new value for the isConcurrent property for this - * object. + * @param isConcurrent

+ * Indicates whether a job is concurrent. Will be true when a job + * is rolling out new job executions or canceling previously + * created executions, otherwise false. + *

* @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/JobSummary.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/JobSummary.java index d4ed3ad6c7..363c49de19 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/JobSummary.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/JobSummary.java @@ -107,7 +107,11 @@ public class JobSummary implements Serializable { private java.util.Date completedAt; /** - * The new value for the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

*/ private Boolean isConcurrent; @@ -743,41 +747,71 @@ public JobSummary withCompletedAt(java.util.Date completedAt) { } /** - * Returns the value of the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

* - * @return The value of the isConcurrent property for this object. + * @return

+ * Indicates whether a job is concurrent. Will be true when a job is + * rolling out new job executions or canceling previously created + * executions, otherwise false. + *

*/ public Boolean isIsConcurrent() { return isConcurrent; } /** - * Returns the value of the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

* - * @return The value of the isConcurrent property for this object. + * @return

+ * Indicates whether a job is concurrent. Will be true when a job is + * rolling out new job executions or canceling previously created + * executions, otherwise false. + *

*/ public Boolean getIsConcurrent() { return isConcurrent; } /** - * Sets the value of isConcurrent + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

* - * @param isConcurrent The new value for the isConcurrent property for this - * object. + * @param isConcurrent

+ * Indicates whether a job is concurrent. Will be true when a job + * is rolling out new job executions or canceling previously + * created executions, otherwise false. + *

*/ public void setIsConcurrent(Boolean isConcurrent) { this.isConcurrent = isConcurrent; } /** - * Sets the value of the isConcurrent property for this object. + *

+ * Indicates whether a job is concurrent. Will be true when a job is rolling + * out new job executions or canceling previously created executions, + * otherwise false. + *

*

* Returns a reference to this object so that method calls can be chained * together. * - * @param isConcurrent The new value for the isConcurrent property for this - * object. + * @param isConcurrent

+ * Indicates whether a job is concurrent. Will be true when a job + * is rolling out new job executions or canceling previously + * created executions, otherwise false. + *

* @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListCACertificatesRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListCACertificatesRequest.java index fcf50cfbea..9b66045f44 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListCACertificatesRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListCACertificatesRequest.java @@ -62,6 +62,17 @@ public class ListCACertificatesRequest extends AmazonWebServiceRequest implement */ private Boolean ascendingOrder; + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ */ + private String templateName; + /** *

* The result page size. @@ -231,6 +242,63 @@ public ListCACertificatesRequest withAscendingOrder(Boolean ascendingOrder) { return this; } + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ * + * @return

+ * The name of the provisioning template. + *

+ */ + public String getTemplateName() { + return templateName; + } + + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ * + * @param templateName

+ * The name of the provisioning template. + *

+ */ + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ * + * @param templateName

+ * The name of the provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ListCACertificatesRequest withTemplateName(String templateName) { + this.templateName = templateName; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -247,7 +315,9 @@ public String toString() { if (getMarker() != null) sb.append("marker: " + getMarker() + ","); if (getAscendingOrder() != null) - sb.append("ascendingOrder: " + getAscendingOrder()); + sb.append("ascendingOrder: " + getAscendingOrder() + ","); + if (getTemplateName() != null) + sb.append("templateName: " + getTemplateName()); sb.append("}"); return sb.toString(); } @@ -261,6 +331,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getMarker() == null) ? 0 : getMarker().hashCode()); hashCode = prime * hashCode + ((getAscendingOrder() == null) ? 0 : getAscendingOrder().hashCode()); + hashCode = prime * hashCode + + ((getTemplateName() == null) ? 0 : getTemplateName().hashCode()); return hashCode; } @@ -288,6 +360,11 @@ public boolean equals(Object obj) { if (other.getAscendingOrder() != null && other.getAscendingOrder().equals(this.getAscendingOrder()) == false) return false; + if (other.getTemplateName() == null ^ this.getTemplateName() == null) + return false; + if (other.getTemplateName() != null + && other.getTemplateName().equals(this.getTemplateName()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListPolicyPrincipalsRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListPolicyPrincipalsRequest.java index 6cb87dd1d1..3299949e76 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListPolicyPrincipalsRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListPolicyPrincipalsRequest.java @@ -24,8 +24,9 @@ * Lists the principals associated with the specified policy. *

*

- * Note: This action is deprecated. Please use - * ListTargetsForPolicy instead. + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use ListTargetsForPolicy + * instead. *

*

* Requires permission to access the AmazonCognito Identity format. *

*

- * Note: This action is deprecated. Please use - * ListAttachedPolicies instead. + * Note: This action is deprecated and works as expected for backward + * compatibility, but we won't add enhancements. Use ListAttachedPolicies + * instead. *

*

* Requires permission to access the - * A list of fleet provisioning template versions. + * A list of provisioning template versions. *

*

* Requires permission to access the - * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -61,7 +61,7 @@ public class ListProvisioningTemplateVersionsRequest extends AmazonWebServiceReq /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -69,7 +69,7 @@ public class ListProvisioningTemplateVersionsRequest extends AmazonWebServiceReq * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -78,7 +78,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -86,7 +86,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -95,7 +95,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -106,7 +106,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplateVersionsResult.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplateVersionsResult.java index 557885b64b..938b06af32 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplateVersionsResult.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplateVersionsResult.java @@ -20,7 +20,7 @@ public class ListProvisioningTemplateVersionsResult implements Serializable { /** *

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

*/ private java.util.List versions; @@ -34,11 +34,11 @@ public class ListProvisioningTemplateVersionsResult implements Serializable { /** *

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

* * @return

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

*/ public java.util.List getVersions() { @@ -47,11 +47,11 @@ public java.util.List getVersions() { /** *

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

* * @param versions

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

*/ public void setVersions(java.util.Collection versions) { @@ -65,14 +65,14 @@ public void setVersions(java.util.Collection /** *

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param versions

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -91,14 +91,14 @@ public ListProvisioningTemplateVersionsResult withVersions( /** *

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param versions

- * The list of fleet provisioning template versions. + * The list of provisioning template versions. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplatesRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplatesRequest.java index 818ad208f2..dbf99a487a 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplatesRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ListProvisioningTemplatesRequest.java @@ -21,7 +21,7 @@ /** *

- * Lists the fleet provisioning templates in your Amazon Web Services account. + * Lists the provisioning templates in your Amazon Web Services account. *

*

* Requires permission to access the - * A list of fleet provisioning templates + * A list of provisioning templates *

*/ private java.util.List templates; @@ -34,11 +34,11 @@ public class ListProvisioningTemplatesResult implements Serializable { /** *

- * A list of fleet provisioning templates + * A list of provisioning templates *

* * @return

- * A list of fleet provisioning templates + * A list of provisioning templates *

*/ public java.util.List getTemplates() { @@ -47,11 +47,11 @@ public java.util.List getTemplates() { /** *

- * A list of fleet provisioning templates + * A list of provisioning templates *

* * @param templates

- * A list of fleet provisioning templates + * A list of provisioning templates *

*/ public void setTemplates(java.util.Collection templates) { @@ -65,14 +65,14 @@ public void setTemplates(java.util.Collection templ /** *

- * A list of fleet provisioning templates + * A list of provisioning templates *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param templates

- * A list of fleet provisioning templates + * A list of provisioning templates *

* @return A reference to this updated object so that method calls can be * chained together. @@ -89,14 +89,14 @@ public ListProvisioningTemplatesResult withTemplates(ProvisioningTemplateSummary /** *

- * A list of fleet provisioning templates + * A list of provisioning templates *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param templates

- * A list of fleet provisioning templates + * A list of provisioning templates *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/PresignedUrlConfig.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/PresignedUrlConfig.java index 3fb451c8a7..41550cc7a6 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/PresignedUrlConfig.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/PresignedUrlConfig.java @@ -29,6 +29,15 @@ public class PresignedUrlConfig implements Serializable { * from the S3 bucket where the job data/updates are stored. The role must * also grant permission for IoT to download the files. *

+ * + *

+ * For information about addressing the confused deputy problem, see cross-service confused deputy prevention in the Amazon Web + * Services IoT Core developer guide. + *

+ * *

* Constraints:
* Length: 20 - 2048
@@ -53,6 +62,15 @@ public class PresignedUrlConfig implements Serializable { * from the S3 bucket where the job data/updates are stored. The role must * also grant permission for IoT to download the files. *

+ * + *

+ * For information about addressing the confused deputy problem, see cross-service confused deputy prevention in the Amazon Web + * Services IoT Core developer guide. + *

+ * *

* Constraints:
* Length: 20 - 2048
@@ -63,6 +81,15 @@ public class PresignedUrlConfig implements Serializable { * The role must also grant permission for IoT to download the * files. *

+ * + *

+ * For information about addressing the confused deputy problem, see + * cross-service confused deputy prevention in the Amazon + * Web Services IoT Core developer guide. + *

+ * */ public String getRoleArn() { return roleArn; @@ -74,6 +101,15 @@ public String getRoleArn() { * from the S3 bucket where the job data/updates are stored. The role must * also grant permission for IoT to download the files. *

+ * + *

+ * For information about addressing the confused deputy problem, see cross-service confused deputy prevention in the Amazon Web + * Services IoT Core developer guide. + *

+ * *

* Constraints:
* Length: 20 - 2048
@@ -84,6 +120,15 @@ public String getRoleArn() { * are stored. The role must also grant permission for IoT to * download the files. *

+ * + *

+ * For information about addressing the confused deputy problem, + * see cross-service confused deputy prevention in the Amazon + * Web Services IoT Core developer guide. + *

+ * */ public void setRoleArn(String roleArn) { this.roleArn = roleArn; @@ -95,6 +140,15 @@ public void setRoleArn(String roleArn) { * from the S3 bucket where the job data/updates are stored. The role must * also grant permission for IoT to download the files. *

+ * + *

+ * For information about addressing the confused deputy problem, see cross-service confused deputy prevention in the Amazon Web + * Services IoT Core developer guide. + *

+ * *

* Returns a reference to this object so that method calls can be chained * together. @@ -108,6 +162,15 @@ public void setRoleArn(String roleArn) { * are stored. The role must also grant permission for IoT to * download the files. *

+ * + *

+ * For information about addressing the confused deputy problem, + * see cross-service confused deputy prevention in the Amazon + * Web Services IoT Core developer guide. + *

+ * * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateSummary.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateSummary.java index f87c8a1bc4..32919d5795 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateSummary.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateSummary.java @@ -19,20 +19,20 @@ /** *

- * A summary of information about a fleet provisioning template. + * A summary of information about a provisioning template. *

*/ public class ProvisioningTemplateSummary implements Serializable { /** *

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*/ private String templateArn; /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -43,7 +43,7 @@ public class ProvisioningTemplateSummary implements Serializable { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -54,14 +54,14 @@ public class ProvisioningTemplateSummary implements Serializable { /** *

- * The date when the fleet provisioning template summary was created. + * The date when the provisioning template summary was created. *

*/ private java.util.Date creationDate; /** *

- * The date when the fleet provisioning template summary was last modified. + * The date when the provisioning template summary was last modified. *

*/ private java.util.Date lastModifiedDate; @@ -75,11 +75,26 @@ public class ProvisioningTemplateSummary implements Serializable { /** *

- * The ARN of the fleet provisioning template. + * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + */ + private String type; + + /** + *

+ * The ARN of the provisioning template. *

* * @return

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*/ public String getTemplateArn() { @@ -88,11 +103,11 @@ public String getTemplateArn() { /** *

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

* * @param templateArn

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*/ public void setTemplateArn(String templateArn) { @@ -101,14 +116,14 @@ public void setTemplateArn(String templateArn) { /** *

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param templateArn

- * The ARN of the fleet provisioning template. + * The ARN of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -120,7 +135,7 @@ public ProvisioningTemplateSummary withTemplateArn(String templateArn) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -128,7 +143,7 @@ public ProvisioningTemplateSummary withTemplateArn(String templateArn) { * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -137,7 +152,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -145,7 +160,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -154,7 +169,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -165,7 +180,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -177,7 +192,7 @@ public ProvisioningTemplateSummary withTemplateName(String templateName) { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -185,7 +200,7 @@ public ProvisioningTemplateSummary withTemplateName(String templateName) { * Pattern: [^\p{C}]*
* * @return

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public String getDescription() { @@ -194,7 +209,7 @@ public String getDescription() { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -202,7 +217,7 @@ public String getDescription() { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public void setDescription(String description) { @@ -211,7 +226,7 @@ public void setDescription(String description) { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -222,7 +237,7 @@ public void setDescription(String description) { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -234,12 +249,11 @@ public ProvisioningTemplateSummary withDescription(String description) { /** *

- * The date when the fleet provisioning template summary was created. + * The date when the provisioning template summary was created. *

* * @return

- * The date when the fleet provisioning template summary was - * created. + * The date when the provisioning template summary was created. *

*/ public java.util.Date getCreationDate() { @@ -248,12 +262,11 @@ public java.util.Date getCreationDate() { /** *

- * The date when the fleet provisioning template summary was created. + * The date when the provisioning template summary was created. *

* * @param creationDate

- * The date when the fleet provisioning template summary was - * created. + * The date when the provisioning template summary was created. *

*/ public void setCreationDate(java.util.Date creationDate) { @@ -262,15 +275,14 @@ public void setCreationDate(java.util.Date creationDate) { /** *

- * The date when the fleet provisioning template summary was created. + * The date when the provisioning template summary was created. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param creationDate

- * The date when the fleet provisioning template summary was - * created. + * The date when the provisioning template summary was created. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -282,11 +294,11 @@ public ProvisioningTemplateSummary withCreationDate(java.util.Date creationDate) /** *

- * The date when the fleet provisioning template summary was last modified. + * The date when the provisioning template summary was last modified. *

* * @return

- * The date when the fleet provisioning template summary was last + * The date when the provisioning template summary was last * modified. *

*/ @@ -296,11 +308,11 @@ public java.util.Date getLastModifiedDate() { /** *

- * The date when the fleet provisioning template summary was last modified. + * The date when the provisioning template summary was last modified. *

* * @param lastModifiedDate

- * The date when the fleet provisioning template summary was last + * The date when the provisioning template summary was last * modified. *

*/ @@ -310,14 +322,14 @@ public void setLastModifiedDate(java.util.Date lastModifiedDate) { /** *

- * The date when the fleet provisioning template summary was last modified. + * The date when the provisioning template summary was last modified. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param lastModifiedDate

- * The date when the fleet provisioning template summary was last + * The date when the provisioning template summary was last * modified. *

* @return A reference to this updated object so that method calls can be @@ -388,6 +400,158 @@ public ProvisioningTemplateSummary withEnabled(Boolean enabled) { return this; } + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @return

+ * The type you define in a provisioning template. You can create a + * template with only one type. You can't change the template type + * after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public String getType() { + return type; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public void setType(String type) { + this.type = type; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see TemplateType + */ + public ProvisioningTemplateSummary withType(String type) { + this.type = type; + return this; + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @see TemplateType + */ + public void setType(TemplateType type) { + this.type = type.toString(); + } + + /** + *

+ * The type you define in a provisioning template. You can create a template + * with only one type. You can't change the template type after its + * creation. The default value is FLEET_PROVISIONING. For more + * information about provisioning template, see: Provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: FLEET_PROVISIONING, JITP + * + * @param type

+ * The type you define in a provisioning template. You can create + * a template with only one type. You can't change the template + * type after its creation. The default value is + * FLEET_PROVISIONING. For more information about + * provisioning template, see: Provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see TemplateType + */ + public ProvisioningTemplateSummary withType(TemplateType type) { + this.type = type.toString(); + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -410,7 +574,9 @@ public String toString() { if (getLastModifiedDate() != null) sb.append("lastModifiedDate: " + getLastModifiedDate() + ","); if (getEnabled() != null) - sb.append("enabled: " + getEnabled()); + sb.append("enabled: " + getEnabled() + ","); + if (getType() != null) + sb.append("type: " + getType()); sb.append("}"); return sb.toString(); } @@ -431,6 +597,7 @@ public int hashCode() { hashCode = prime * hashCode + ((getLastModifiedDate() == null) ? 0 : getLastModifiedDate().hashCode()); hashCode = prime * hashCode + ((getEnabled() == null) ? 0 : getEnabled().hashCode()); + hashCode = prime * hashCode + ((getType() == null) ? 0 : getType().hashCode()); return hashCode; } @@ -474,6 +641,10 @@ public boolean equals(Object obj) { return false; if (other.getEnabled() != null && other.getEnabled().equals(this.getEnabled()) == false) return false; + if (other.getType() == null ^ this.getType() == null) + return false; + if (other.getType() != null && other.getType().equals(this.getType()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateVersionSummary.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateVersionSummary.java index 7eb91ccff8..94502bf324 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateVersionSummary.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ProvisioningTemplateVersionSummary.java @@ -32,14 +32,14 @@ public class ProvisioningTemplateVersionSummary implements Serializable { /** *

- * The date when the fleet provisioning template version was created + * The date when the provisioning template version was created *

*/ private java.util.Date creationDate; /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

*/ @@ -92,11 +92,11 @@ public ProvisioningTemplateVersionSummary withVersionId(Integer versionId) { /** *

- * The date when the fleet provisioning template version was created + * The date when the provisioning template version was created *

* * @return

- * The date when the fleet provisioning template version was created + * The date when the provisioning template version was created *

*/ public java.util.Date getCreationDate() { @@ -105,12 +105,11 @@ public java.util.Date getCreationDate() { /** *

- * The date when the fleet provisioning template version was created + * The date when the provisioning template version was created *

* * @param creationDate

- * The date when the fleet provisioning template version was - * created + * The date when the provisioning template version was created *

*/ public void setCreationDate(java.util.Date creationDate) { @@ -119,15 +118,14 @@ public void setCreationDate(java.util.Date creationDate) { /** *

- * The date when the fleet provisioning template version was created + * The date when the provisioning template version was created *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param creationDate

- * The date when the fleet provisioning template version was - * created + * The date when the provisioning template version was created *

* @return A reference to this updated object so that method calls can be * chained together. @@ -139,13 +137,13 @@ public ProvisioningTemplateVersionSummary withCreationDate(java.util.Date creati /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

* * @return

- * True if the fleet provisioning template version is the default - * version, otherwise false. + * True if the provisioning template version is the default version, + * otherwise false. *

*/ public Boolean isIsDefaultVersion() { @@ -154,13 +152,13 @@ public Boolean isIsDefaultVersion() { /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

* * @return

- * True if the fleet provisioning template version is the default - * version, otherwise false. + * True if the provisioning template version is the default version, + * otherwise false. *

*/ public Boolean getIsDefaultVersion() { @@ -169,12 +167,12 @@ public Boolean getIsDefaultVersion() { /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

* * @param isDefaultVersion

- * True if the fleet provisioning template version is the default + * True if the provisioning template version is the default * version, otherwise false. *

*/ @@ -184,7 +182,7 @@ public void setIsDefaultVersion(Boolean isDefaultVersion) { /** *

- * True if the fleet provisioning template version is the default version, + * True if the provisioning template version is the default version, * otherwise false. *

*

@@ -192,7 +190,7 @@ public void setIsDefaultVersion(Boolean isDefaultVersion) { * together. * * @param isDefaultVersion

- * True if the fleet provisioning template version is the default + * True if the provisioning template version is the default * version, otherwise false. *

* @return A reference to this updated object so that method calls can be diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCACertificateRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCACertificateRequest.java index c922361050..1ac7cc36ba 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCACertificateRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCACertificateRequest.java @@ -21,13 +21,10 @@ /** *

- * Registers a CA certificate with IoT. This CA certificate can then be used to - * sign device certificates, which can be then registered with IoT. You can - * register up to 10 CA certificates per Amazon Web Services account that have - * the same subject field. This enables you to have up to 10 certificate - * authorities sign your device certificates. If you have more than one CA - * certificate registered, make sure you pass the CA certificate when you - * register your device certificates with the RegisterCertificate action. + * Registers a CA certificate with Amazon Web Services IoT Core. There is no + * limit to the number of CA certificates you can register in your Amazon Web + * Services account. You can register up to 10 CA certificates with the same + * CA subject field per Amazon Web Services account. *

*

* Requires permission to access the - * The private key verification certificate. + * The private key verification certificate. If certificateMode + * is SNI_ONLY, the verificationCertificate field + * must be empty. If certificateMode is DEFAULT or + * not provided, the verificationCertificate field must not be + * empty. *

*

* Constraints:
@@ -103,6 +104,27 @@ public class RegisterCACertificateRequest extends AmazonWebServiceRequest implem */ private java.util.List tags; + /** + *

+ * Describes the certificate mode in which the Certificate Authority (CA) + * will be registered. If the verificationCertificate field is + * not provided, set certificateMode to be + * SNI_ONLY. If the verificationCertificate field + * is provided, set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults to + * DEFAULT. All the device certificates that are registered + * using this CA will be registered in the same certificate mode as the CA. + * For more information about certificate mode for device certificates, see + * certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + */ + private String certificateMode; + /** *

* The CA certificate. @@ -162,7 +184,11 @@ public RegisterCACertificateRequest withCaCertificate(String caCertificate) { /** *

- * The private key verification certificate. + * The private key verification certificate. If certificateMode + * is SNI_ONLY, the verificationCertificate field + * must be empty. If certificateMode is DEFAULT or + * not provided, the verificationCertificate field must not be + * empty. *

*

* Constraints:
@@ -170,7 +196,12 @@ public RegisterCACertificateRequest withCaCertificate(String caCertificate) { * Pattern: [\s\S]*
* * @return

- * The private key verification certificate. + * The private key verification certificate. If + * certificateMode is SNI_ONLY, the + * verificationCertificate field must be empty. If + * certificateMode is DEFAULT or not + * provided, the verificationCertificate field must not + * be empty. *

*/ public String getVerificationCertificate() { @@ -179,7 +210,11 @@ public String getVerificationCertificate() { /** *

- * The private key verification certificate. + * The private key verification certificate. If certificateMode + * is SNI_ONLY, the verificationCertificate field + * must be empty. If certificateMode is DEFAULT or + * not provided, the verificationCertificate field must not be + * empty. *

*

* Constraints:
@@ -187,7 +222,12 @@ public String getVerificationCertificate() { * Pattern: [\s\S]*
* * @param verificationCertificate

- * The private key verification certificate. + * The private key verification certificate. If + * certificateMode is SNI_ONLY, the + * verificationCertificate field must be empty. If + * certificateMode is DEFAULT or not + * provided, the verificationCertificate field must + * not be empty. *

*/ public void setVerificationCertificate(String verificationCertificate) { @@ -196,7 +236,11 @@ public void setVerificationCertificate(String verificationCertificate) { /** *

- * The private key verification certificate. + * The private key verification certificate. If certificateMode + * is SNI_ONLY, the verificationCertificate field + * must be empty. If certificateMode is DEFAULT or + * not provided, the verificationCertificate field must not be + * empty. *

*

* Returns a reference to this object so that method calls can be chained @@ -207,7 +251,12 @@ public void setVerificationCertificate(String verificationCertificate) { * Pattern: [\s\S]*
* * @param verificationCertificate

- * The private key verification certificate. + * The private key verification certificate. If + * certificateMode is SNI_ONLY, the + * verificationCertificate field must be empty. If + * certificateMode is DEFAULT or not + * provided, the verificationCertificate field must + * not be empty. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -596,6 +645,218 @@ public RegisterCACertificateRequest withTags(java.util.Collection tags) { return this; } + /** + *

+ * Describes the certificate mode in which the Certificate Authority (CA) + * will be registered. If the verificationCertificate field is + * not provided, set certificateMode to be + * SNI_ONLY. If the verificationCertificate field + * is provided, set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults to + * DEFAULT. All the device certificates that are registered + * using this CA will be registered in the same certificate mode as the CA. + * For more information about certificate mode for device certificates, see + * certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @return

+ * Describes the certificate mode in which the Certificate Authority + * (CA) will be registered. If the + * verificationCertificate field is not provided, set + * certificateMode to be SNI_ONLY. If the + * verificationCertificate field is provided, set + * certificateMode to be DEFAULT. When + * certificateMode is not provided, it defaults to + * DEFAULT. All the device certificates that are + * registered using this CA will be registered in the same + * certificate mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ * @see CertificateMode + */ + public String getCertificateMode() { + return certificateMode; + } + + /** + *

+ * Describes the certificate mode in which the Certificate Authority (CA) + * will be registered. If the verificationCertificate field is + * not provided, set certificateMode to be + * SNI_ONLY. If the verificationCertificate field + * is provided, set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults to + * DEFAULT. All the device certificates that are registered + * using this CA will be registered in the same certificate mode as the CA. + * For more information about certificate mode for device certificates, see + * certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * Describes the certificate mode in which the Certificate + * Authority (CA) will be registered. If the + * verificationCertificate field is not provided, + * set certificateMode to be SNI_ONLY. + * If the verificationCertificate field is provided, + * set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults + * to DEFAULT. All the device certificates that are + * registered using this CA will be registered in the same + * certificate mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ * @see CertificateMode + */ + public void setCertificateMode(String certificateMode) { + this.certificateMode = certificateMode; + } + + /** + *

+ * Describes the certificate mode in which the Certificate Authority (CA) + * will be registered. If the verificationCertificate field is + * not provided, set certificateMode to be + * SNI_ONLY. If the verificationCertificate field + * is provided, set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults to + * DEFAULT. All the device certificates that are registered + * using this CA will be registered in the same certificate mode as the CA. + * For more information about certificate mode for device certificates, see + * certificate mode. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * Describes the certificate mode in which the Certificate + * Authority (CA) will be registered. If the + * verificationCertificate field is not provided, + * set certificateMode to be SNI_ONLY. + * If the verificationCertificate field is provided, + * set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults + * to DEFAULT. All the device certificates that are + * registered using this CA will be registered in the same + * certificate mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see CertificateMode + */ + public RegisterCACertificateRequest withCertificateMode(String certificateMode) { + this.certificateMode = certificateMode; + return this; + } + + /** + *

+ * Describes the certificate mode in which the Certificate Authority (CA) + * will be registered. If the verificationCertificate field is + * not provided, set certificateMode to be + * SNI_ONLY. If the verificationCertificate field + * is provided, set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults to + * DEFAULT. All the device certificates that are registered + * using this CA will be registered in the same certificate mode as the CA. + * For more information about certificate mode for device certificates, see + * certificate mode. + *

+ *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * Describes the certificate mode in which the Certificate + * Authority (CA) will be registered. If the + * verificationCertificate field is not provided, + * set certificateMode to be SNI_ONLY. + * If the verificationCertificate field is provided, + * set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults + * to DEFAULT. All the device certificates that are + * registered using this CA will be registered in the same + * certificate mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ * @see CertificateMode + */ + public void setCertificateMode(CertificateMode certificateMode) { + this.certificateMode = certificateMode.toString(); + } + + /** + *

+ * Describes the certificate mode in which the Certificate Authority (CA) + * will be registered. If the verificationCertificate field is + * not provided, set certificateMode to be + * SNI_ONLY. If the verificationCertificate field + * is provided, set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults to + * DEFAULT. All the device certificates that are registered + * using this CA will be registered in the same certificate mode as the CA. + * For more information about certificate mode for device certificates, see + * certificate mode. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Allowed Values: DEFAULT, SNI_ONLY + * + * @param certificateMode

+ * Describes the certificate mode in which the Certificate + * Authority (CA) will be registered. If the + * verificationCertificate field is not provided, + * set certificateMode to be SNI_ONLY. + * If the verificationCertificate field is provided, + * set certificateMode to be DEFAULT. + * When certificateMode is not provided, it defaults + * to DEFAULT. All the device certificates that are + * registered using this CA will be registered in the same + * certificate mode as the CA. For more information about + * certificate mode for device certificates, see certificate mode. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + * @see CertificateMode + */ + public RegisterCACertificateRequest withCertificateMode(CertificateMode certificateMode) { + this.certificateMode = certificateMode.toString(); + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -618,7 +879,9 @@ public String toString() { if (getRegistrationConfig() != null) sb.append("registrationConfig: " + getRegistrationConfig() + ","); if (getTags() != null) - sb.append("tags: " + getTags()); + sb.append("tags: " + getTags() + ","); + if (getCertificateMode() != null) + sb.append("certificateMode: " + getCertificateMode()); sb.append("}"); return sb.toString(); } @@ -642,6 +905,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getRegistrationConfig() == null) ? 0 : getRegistrationConfig().hashCode()); hashCode = prime * hashCode + ((getTags() == null) ? 0 : getTags().hashCode()); + hashCode = prime * hashCode + + ((getCertificateMode() == null) ? 0 : getCertificateMode().hashCode()); return hashCode; } @@ -685,6 +950,11 @@ public boolean equals(Object obj) { return false; if (other.getTags() != null && other.getTags().equals(this.getTags()) == false) return false; + if (other.getCertificateMode() == null ^ this.getCertificateMode() == null) + return false; + if (other.getCertificateMode() != null + && other.getCertificateMode().equals(this.getCertificateMode()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCertificateRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCertificateRequest.java index 8f60d013d5..0b53444d3b 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCertificateRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegisterCertificateRequest.java @@ -21,7 +21,9 @@ /** *

- * Registers a device certificate with IoT. If you have more than one CA + * Registers a device certificate with IoT in the same certificate mode as the signing CA. If you have more than one CA * certificate that has the same subject field, you must specify the CA * certificate that was used to sign the device certificate being registered. *

diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegistrationConfig.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegistrationConfig.java index 4fd29778e2..0bc6ace2cf 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegistrationConfig.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/RegistrationConfig.java @@ -44,6 +44,17 @@ public class RegistrationConfig implements Serializable { */ private String roleArn; + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ */ + private String templateName; + /** *

* The template body. @@ -155,6 +166,63 @@ public RegistrationConfig withRoleArn(String roleArn) { return this; } + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ * + * @return

+ * The name of the provisioning template. + *

+ */ + public String getTemplateName() { + return templateName; + } + + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ * + * @param templateName

+ * The name of the provisioning template. + *

+ */ + public void setTemplateName(String templateName) { + this.templateName = templateName; + } + + /** + *

+ * The name of the provisioning template. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + *

+ * Constraints:
+ * Length: 1 - 36
+ * Pattern: ^[0-9A-Za-z_-]+$
+ * + * @param templateName

+ * The name of the provisioning template. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public RegistrationConfig withTemplateName(String templateName) { + this.templateName = templateName; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -169,7 +237,9 @@ public String toString() { if (getTemplateBody() != null) sb.append("templateBody: " + getTemplateBody() + ","); if (getRoleArn() != null) - sb.append("roleArn: " + getRoleArn()); + sb.append("roleArn: " + getRoleArn() + ","); + if (getTemplateName() != null) + sb.append("templateName: " + getTemplateName()); sb.append("}"); return sb.toString(); } @@ -182,6 +252,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getTemplateBody() == null) ? 0 : getTemplateBody().hashCode()); hashCode = prime * hashCode + ((getRoleArn() == null) ? 0 : getRoleArn().hashCode()); + hashCode = prime * hashCode + + ((getTemplateName() == null) ? 0 : getTemplateName().hashCode()); return hashCode; } @@ -205,6 +277,11 @@ public boolean equals(Object obj) { return false; if (other.getRoleArn() != null && other.getRoleArn().equals(this.getRoleArn()) == false) return false; + if (other.getTemplateName() == null ^ this.getTemplateName() == null) + return false; + if (other.getTemplateName() != null + && other.getTemplateName().equals(this.getTemplateName()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/SearchIndexRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/SearchIndexRequest.java index 6198930de8..4654cb9c33 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/SearchIndexRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/SearchIndexRequest.java @@ -43,7 +43,10 @@ public class SearchIndexRequest extends AmazonWebServiceRequest implements Seria /** *

- * The search query string. + * The search query string. For more information about the search query + * syntax, see Query syntax. *

*

* Constraints:
@@ -135,14 +138,20 @@ public SearchIndexRequest withIndexName(String indexName) { /** *

- * The search query string. + * The search query string. For more information about the search query + * syntax, see Query syntax. *

*

* Constraints:
* Length: 1 -
* * @return

- * The search query string. + * The search query string. For more information about the search + * query syntax, see Query syntax. *

*/ public String getQueryString() { @@ -151,14 +160,20 @@ public String getQueryString() { /** *

- * The search query string. + * The search query string. For more information about the search query + * syntax, see Query syntax. *

*

* Constraints:
* Length: 1 -
* * @param queryString

- * The search query string. + * The search query string. For more information about the search + * query syntax, see Query syntax. *

*/ public void setQueryString(String queryString) { @@ -167,7 +182,10 @@ public void setQueryString(String queryString) { /** *

- * The search query string. + * The search query string. For more information about the search query + * syntax, see Query syntax. *

*

* Returns a reference to this object so that method calls can be chained @@ -177,7 +195,10 @@ public void setQueryString(String queryString) { * Length: 1 -
* * @param queryString

- * The search query string. + * The search query string. For more information about the search + * query syntax, see Query syntax. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/TemplateType.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/TemplateType.java new file mode 100644 index 0000000000..dd4d7e93f9 --- /dev/null +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/TemplateType.java @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.iot.model; + +import java.util.HashMap; +import java.util.Map; + +/** + * Template Type + */ +public enum TemplateType { + + FLEET_PROVISIONING("FLEET_PROVISIONING"), + JITP("JITP"); + + private String value; + + private TemplateType(String value) { + this.value = value; + } + + @Override + public String toString() { + return value; + } + + private static final Map enumMap; + static { + enumMap = new HashMap(); + enumMap.put("FLEET_PROVISIONING", FLEET_PROVISIONING); + enumMap.put("JITP", JITP); + } + + /** + * Use this in place of valueOf. + * + * @param value real value + * @return TemplateType corresponding to the value + */ + public static TemplateType fromValue(String value) { + if (value == null || value.isEmpty()) { + throw new IllegalArgumentException("Value cannot be null or empty!"); + } else if (enumMap.containsKey(value)) { + return enumMap.get(value); + } else { + throw new IllegalArgumentException("Cannot create enum from " + value + " value!"); + } + } +} diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ThingIndexingConfiguration.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ThingIndexingConfiguration.java index 5477484af0..946e1bcd7b 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ThingIndexingConfiguration.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/ThingIndexingConfiguration.java @@ -147,6 +147,17 @@ public class ThingIndexingConfiguration implements Serializable { */ private java.util.List customFields; + /** + *

+ * Provides additional filters for specific data sources. Named shadow is + * the only data source that currently supports and requires a filter. To + * add named shadows to your fleet indexing configuration, set + * namedShadowIndexingMode to be ON and specify + * your shadow names in filter. + *

+ */ + private IndexingFilter filter; + /** *

* Thing indexing mode. Valid values are: @@ -1387,6 +1398,78 @@ public ThingIndexingConfiguration withCustomFields(java.util.Collection c return this; } + /** + *

+ * Provides additional filters for specific data sources. Named shadow is + * the only data source that currently supports and requires a filter. To + * add named shadows to your fleet indexing configuration, set + * namedShadowIndexingMode to be ON and specify + * your shadow names in filter. + *

+ * + * @return

+ * Provides additional filters for specific data sources. Named + * shadow is the only data source that currently supports and + * requires a filter. To add named shadows to your fleet indexing + * configuration, set namedShadowIndexingMode to be + * ON and specify your shadow names in + * filter. + *

+ */ + public IndexingFilter getFilter() { + return filter; + } + + /** + *

+ * Provides additional filters for specific data sources. Named shadow is + * the only data source that currently supports and requires a filter. To + * add named shadows to your fleet indexing configuration, set + * namedShadowIndexingMode to be ON and specify + * your shadow names in filter. + *

+ * + * @param filter

+ * Provides additional filters for specific data sources. Named + * shadow is the only data source that currently supports and + * requires a filter. To add named shadows to your fleet indexing + * configuration, set namedShadowIndexingMode to be + * ON and specify your shadow names in + * filter. + *

+ */ + public void setFilter(IndexingFilter filter) { + this.filter = filter; + } + + /** + *

+ * Provides additional filters for specific data sources. Named shadow is + * the only data source that currently supports and requires a filter. To + * add named shadows to your fleet indexing configuration, set + * namedShadowIndexingMode to be ON and specify + * your shadow names in filter. + *

+ *

+ * Returns a reference to this object so that method calls can be chained + * together. + * + * @param filter

+ * Provides additional filters for specific data sources. Named + * shadow is the only data source that currently supports and + * requires a filter. To add named shadows to your fleet indexing + * configuration, set namedShadowIndexingMode to be + * ON and specify your shadow names in + * filter. + *

+ * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ThingIndexingConfiguration withFilter(IndexingFilter filter) { + this.filter = filter; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -1409,7 +1492,9 @@ public String toString() { if (getManagedFields() != null) sb.append("managedFields: " + getManagedFields() + ","); if (getCustomFields() != null) - sb.append("customFields: " + getCustomFields()); + sb.append("customFields: " + getCustomFields() + ","); + if (getFilter() != null) + sb.append("filter: " + getFilter()); sb.append("}"); return sb.toString(); } @@ -1437,6 +1522,7 @@ public int hashCode() { + ((getManagedFields() == null) ? 0 : getManagedFields().hashCode()); hashCode = prime * hashCode + ((getCustomFields() == null) ? 0 : getCustomFields().hashCode()); + hashCode = prime * hashCode + ((getFilter() == null) ? 0 : getFilter().hashCode()); return hashCode; } @@ -1485,6 +1571,10 @@ public boolean equals(Object obj) { if (other.getCustomFields() != null && other.getCustomFields().equals(this.getCustomFields()) == false) return false; + if (other.getFilter() == null ^ this.getFilter() == null) + return false; + if (other.getFilter() != null && other.getFilter().equals(this.getFilter()) == false) + return false; return true; } } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/UpdateProvisioningTemplateRequest.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/UpdateProvisioningTemplateRequest.java index a0c00f129b..3de887396c 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/UpdateProvisioningTemplateRequest.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/UpdateProvisioningTemplateRequest.java @@ -21,7 +21,7 @@ /** *

- * Updates a fleet provisioning template. + * Updates a provisioning template. *

*

* Requires permission to access the - * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -44,7 +44,7 @@ public class UpdateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -55,7 +55,7 @@ public class UpdateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*/ private Boolean enabled; @@ -94,7 +94,7 @@ public class UpdateProvisioningTemplateRequest extends AmazonWebServiceRequest i /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -102,7 +102,7 @@ public class UpdateProvisioningTemplateRequest extends AmazonWebServiceRequest i * Pattern: ^[0-9A-Za-z_-]+$
* * @return

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public String getTemplateName() { @@ -111,7 +111,7 @@ public String getTemplateName() { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Constraints:
@@ -119,7 +119,7 @@ public String getTemplateName() { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*/ public void setTemplateName(String templateName) { @@ -128,7 +128,7 @@ public void setTemplateName(String templateName) { /** *

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -139,7 +139,7 @@ public void setTemplateName(String templateName) { * Pattern: ^[0-9A-Za-z_-]+$
* * @param templateName

- * The name of the fleet provisioning template. + * The name of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -151,7 +151,7 @@ public UpdateProvisioningTemplateRequest withTemplateName(String templateName) { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -159,7 +159,7 @@ public UpdateProvisioningTemplateRequest withTemplateName(String templateName) { * Pattern: [^\p{C}]*
* * @return

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public String getDescription() { @@ -168,7 +168,7 @@ public String getDescription() { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Constraints:
@@ -176,7 +176,7 @@ public String getDescription() { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*/ public void setDescription(String description) { @@ -185,7 +185,7 @@ public void setDescription(String description) { /** *

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

*

* Returns a reference to this object so that method calls can be chained @@ -196,7 +196,7 @@ public void setDescription(String description) { * Pattern: [^\p{C}]*
* * @param description

- * The description of the fleet provisioning template. + * The description of the provisioning template. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -208,11 +208,11 @@ public UpdateProvisioningTemplateRequest withDescription(String description) { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

* * @return

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*/ public Boolean isEnabled() { @@ -221,11 +221,11 @@ public Boolean isEnabled() { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

* * @return

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*/ public Boolean getEnabled() { @@ -234,12 +234,11 @@ public Boolean getEnabled() { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

* * @param enabled

- * True to enable the fleet provisioning template, otherwise - * false. + * True to enable the provisioning template, otherwise false. *

*/ public void setEnabled(Boolean enabled) { @@ -248,15 +247,14 @@ public void setEnabled(Boolean enabled) { /** *

- * True to enable the fleet provisioning template, otherwise false. + * True to enable the provisioning template, otherwise false. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param enabled

- * True to enable the fleet provisioning template, otherwise - * false. + * True to enable the provisioning template, otherwise false. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonMarshaller.java index 2e510d4dff..16fb7387e3 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonMarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonMarshaller.java @@ -82,6 +82,11 @@ public void marshall(CACertificateDescription cACertificateDescription, AwsJsonW jsonWriter.name("validity"); CertificateValidityJsonMarshaller.getInstance().marshall(validity, jsonWriter); } + if (cACertificateDescription.getCertificateMode() != null) { + String certificateMode = cACertificateDescription.getCertificateMode(); + jsonWriter.name("certificateMode"); + jsonWriter.value(certificateMode); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonUnmarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonUnmarshaller.java index 36aac791a5..f6e1d34bac 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonUnmarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CACertificateDescriptionJsonUnmarshaller.java @@ -71,6 +71,9 @@ public CACertificateDescription unmarshall(JsonUnmarshallerContext context) thro cACertificateDescription.setValidity(CertificateValidityJsonUnmarshaller .getInstance() .unmarshall(context)); + } else if (name.equals("certificateMode")) { + cACertificateDescription.setCertificateMode(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CreateProvisioningTemplateRequestMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CreateProvisioningTemplateRequestMarshaller.java index 73ed42d6d3..2d651b26d0 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CreateProvisioningTemplateRequestMarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/CreateProvisioningTemplateRequestMarshaller.java @@ -105,6 +105,11 @@ public Request marshall( } jsonWriter.endArray(); } + if (createProvisioningTemplateRequest.getType() != null) { + String type = createProvisioningTemplateRequest.getType(); + jsonWriter.name("type"); + jsonWriter.value(type); + } jsonWriter.endObject(); jsonWriter.close(); diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/DescribeProvisioningTemplateResultJsonUnmarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/DescribeProvisioningTemplateResultJsonUnmarshaller.java index 41d76071aa..a26e6c62f8 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/DescribeProvisioningTemplateResultJsonUnmarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/DescribeProvisioningTemplateResultJsonUnmarshaller.java @@ -73,6 +73,9 @@ public DescribeProvisioningTemplateResult unmarshall(JsonUnmarshallerContext con describeProvisioningTemplateResult .setPreProvisioningHook(ProvisioningHookJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("type")) { + describeProvisioningTemplateResult.setType(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonMarshaller.java new file mode 100644 index 0000000000..7d30c99300 --- /dev/null +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonMarshaller.java @@ -0,0 +1,50 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.iot.model.transform; + +import com.amazonaws.services.iot.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO IndexingFilter + */ +class IndexingFilterJsonMarshaller { + + public void marshall(IndexingFilter indexingFilter, AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (indexingFilter.getNamedShadowNames() != null) { + java.util.List namedShadowNames = indexingFilter.getNamedShadowNames(); + jsonWriter.name("namedShadowNames"); + jsonWriter.beginArray(); + for (String namedShadowNamesItem : namedShadowNames) { + if (namedShadowNamesItem != null) { + jsonWriter.value(namedShadowNamesItem); + } + } + jsonWriter.endArray(); + } + jsonWriter.endObject(); + } + + private static IndexingFilterJsonMarshaller instance; + + public static IndexingFilterJsonMarshaller getInstance() { + if (instance == null) + instance = new IndexingFilterJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonUnmarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonUnmarshaller.java new file mode 100644 index 0000000000..f9df227237 --- /dev/null +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/IndexingFilterJsonUnmarshaller.java @@ -0,0 +1,59 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.iot.model.transform; + +import com.amazonaws.services.iot.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO IndexingFilter + */ +class IndexingFilterJsonUnmarshaller implements + Unmarshaller { + + public IndexingFilter unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + IndexingFilter indexingFilter = new IndexingFilter(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("namedShadowNames")) { + indexingFilter.setNamedShadowNames(new ListUnmarshaller( + StringJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return indexingFilter; + } + + private static IndexingFilterJsonUnmarshaller instance; + + public static IndexingFilterJsonUnmarshaller getInstance() { + if (instance == null) + instance = new IndexingFilterJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ListCACertificatesRequestMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ListCACertificatesRequestMarshaller.java index 3cf70ab40d..aef3d7fec9 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ListCACertificatesRequestMarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ListCACertificatesRequestMarshaller.java @@ -67,6 +67,10 @@ public Request marshall( request.addParameter("isAscendingOrder", StringUtils.fromBoolean(listCACertificatesRequest.getAscendingOrder())); } + if (listCACertificatesRequest.getTemplateName() != null) { + request.addParameter("templateName", + StringUtils.fromString(listCACertificatesRequest.getTemplateName())); + } request.setResourcePath(uriResourcePath); if (!request.getHeaders().containsKey("Content-Type")) { request.addHeader("Content-Type", "application/x-amz-json-1.0"); diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonMarshaller.java index cb55fb92b5..7f173a1105 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonMarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonMarshaller.java @@ -57,6 +57,11 @@ public void marshall(ProvisioningTemplateSummary provisioningTemplateSummary, jsonWriter.name("enabled"); jsonWriter.value(enabled); } + if (provisioningTemplateSummary.getType() != null) { + String type = provisioningTemplateSummary.getType(); + jsonWriter.name("type"); + jsonWriter.value(type); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonUnmarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonUnmarshaller.java index c7990ff430..36aca92064 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonUnmarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ProvisioningTemplateSummaryJsonUnmarshaller.java @@ -54,6 +54,9 @@ public ProvisioningTemplateSummary unmarshall(JsonUnmarshallerContext context) t } else if (name.equals("enabled")) { provisioningTemplateSummary.setEnabled(BooleanJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("type")) { + provisioningTemplateSummary.setType(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegisterCACertificateRequestMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegisterCACertificateRequestMarshaller.java index 87f18fc805..04f81967b1 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegisterCACertificateRequestMarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegisterCACertificateRequestMarshaller.java @@ -98,6 +98,11 @@ public Request marshall( } jsonWriter.endArray(); } + if (registerCACertificateRequest.getCertificateMode() != null) { + String certificateMode = registerCACertificateRequest.getCertificateMode(); + jsonWriter.name("certificateMode"); + jsonWriter.value(certificateMode); + } jsonWriter.endObject(); jsonWriter.close(); diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonMarshaller.java index 3a2d0738c6..63ac54f496 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonMarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonMarshaller.java @@ -37,6 +37,11 @@ public void marshall(RegistrationConfig registrationConfig, AwsJsonWriter jsonWr jsonWriter.name("roleArn"); jsonWriter.value(roleArn); } + if (registrationConfig.getTemplateName() != null) { + String templateName = registrationConfig.getTemplateName(); + jsonWriter.name("templateName"); + jsonWriter.value(templateName); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonUnmarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonUnmarshaller.java index 43711aaeac..bdafaf19db 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonUnmarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/RegistrationConfigJsonUnmarshaller.java @@ -42,6 +42,9 @@ public RegistrationConfig unmarshall(JsonUnmarshallerContext context) throws Exc } else if (name.equals("roleArn")) { registrationConfig.setRoleArn(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("templateName")) { + registrationConfig.setTemplateName(StringJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonMarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonMarshaller.java index 5e9ddd7216..fad882a799 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonMarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonMarshaller.java @@ -72,6 +72,11 @@ public void marshall(ThingIndexingConfiguration thingIndexingConfiguration, } jsonWriter.endArray(); } + if (thingIndexingConfiguration.getFilter() != null) { + IndexingFilter filter = thingIndexingConfiguration.getFilter(); + jsonWriter.name("filter"); + IndexingFilterJsonMarshaller.getInstance().marshall(filter, jsonWriter); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonUnmarshaller.java b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonUnmarshaller.java index c296684db0..4c06d41c21 100644 --- a/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonUnmarshaller.java +++ b/aws-android-sdk-iot/src/main/java/com/amazonaws/services/iot/model/transform/ThingIndexingConfigurationJsonUnmarshaller.java @@ -62,6 +62,9 @@ public ThingIndexingConfiguration unmarshall(JsonUnmarshallerContext context) th FieldJsonUnmarshaller.getInstance() ) .unmarshall(context)); + } else if (name.equals("filter")) { + thingIndexingConfiguration.setFilter(IndexingFilterJsonUnmarshaller.getInstance() + .unmarshall(context)); } else { reader.skipValue(); } From b2b540036c49f8fc7288fc07cd167b63ce72953c Mon Sep 17 00:00:00 2001 From: AWS Mobile SDK Bot <46607340+awsmobilesdk@users.noreply.github.com> Date: Tue, 9 Aug 2022 07:26:02 -0700 Subject: [PATCH 06/14] feat(aws-android-sdk-cognitoidentityprovider): update models to latest (#2966) Co-authored-by: Erica Eaton <67125657+eeatonaws@users.noreply.github.com> --- .../AmazonCognitoIdentityProvider.java | 31 +- .../AmazonCognitoIdentityProviderClient.java | 32 +- .../model/AssociateSoftwareTokenRequest.java | 6 +- .../model/AssociateSoftwareTokenResult.java | 31 +- .../model/ConfirmForgotPasswordRequest.java | 45 +- .../model/CreateUserPoolClientRequest.java | 609 ++++++++++-------- .../model/CreateUserPoolRequest.java | 117 +++- .../model/DeviceConfigurationType.java | 149 +++-- .../model/ForbiddenException.java | 37 ++ .../model/GetUserPoolMfaConfigResult.java | 67 +- .../model/SetUserMFAPreferenceRequest.java | 17 +- .../model/UpdateUserPoolClientRequest.java | 49 +- .../model/UpdateUserPoolRequest.java | 85 ++- .../UserAttributeUpdateSettingsType.java | 2 +- .../model/UserPoolClientType.java | 49 +- .../model/UserPoolType.java | 85 ++- .../ForbiddenExceptionUnmarshaller.java | 42 ++ 17 files changed, 925 insertions(+), 528 deletions(-) create mode 100644 aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ForbiddenException.java create mode 100644 aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/transform/ForbiddenExceptionUnmarshaller.java diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProvider.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProvider.java index cabc300036..8455d68266 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProvider.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProvider.java @@ -1227,9 +1227,9 @@ AdminUserGlobalSignOutResult adminUserGlobalSignOut( /** *

- * Begins setup of time-based one-time password multi-factor authentication - * (TOTP MFA) for a user, with a unique private key that Amazon Cognito - * generates and returns in the API response. You can authorize an + * Begins setup of time-based one-time password (TOTP) multi-factor + * authentication (MFA) for a user, with a unique private key that Amazon + * Cognito generates and returns in the API response. You can authorize an * AssociateSoftwareToken request with either the user's access * token, or a session string from a challenge response that you received * from Amazon Cognito. @@ -1264,6 +1264,7 @@ AdminUserGlobalSignOutResult adminUserGlobalSignOut( * @throws ResourceNotFoundException * @throws InternalErrorException * @throws SoftwareTokenMFANotFoundException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -1296,6 +1297,7 @@ AssociateSoftwareTokenResult associateSoftwareToken( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -1330,6 +1332,7 @@ ChangePasswordResult changePassword(ChangePasswordRequest changePasswordRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -1368,6 +1371,7 @@ ConfirmDeviceResult confirmDevice(ConfirmDeviceRequest confirmDeviceRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -1404,6 +1408,7 @@ ConfirmForgotPasswordResult confirmForgotPassword( * @throws LimitExceededException * @throws UserNotFoundException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -1735,6 +1740,7 @@ void deleteResourceServer(DeleteResourceServerRequest deleteResourceServerReques * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -1765,6 +1771,7 @@ void deleteUser(DeleteUserRequest deleteUserRequest) throws AmazonClientExceptio * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2057,6 +2064,7 @@ DescribeUserPoolDomainResult describeUserPoolDomain( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2128,6 +2136,7 @@ void forgetDevice(ForgetDeviceRequest forgetDeviceRequest) throws AmazonClientEx * @throws CodeDeliveryFailureException * @throws UserNotFoundException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2186,6 +2195,7 @@ GetCSVHeaderResult getCSVHeader(GetCSVHeaderRequest getCSVHeaderRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2323,6 +2333,7 @@ GetUICustomizationResult getUICustomization(GetUICustomizationRequest getUICusto * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2388,6 +2399,7 @@ GetUserResult getUser(GetUserRequest getUserRequest) throws AmazonClientExceptio * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2448,6 +2460,7 @@ GetUserPoolMfaConfigResult getUserPoolMfaConfig( * @throws PasswordResetRequiredException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2512,6 +2525,7 @@ GlobalSignOutResult globalSignOut(GlobalSignOutRequest globalSignOutRequest) * @throws InternalErrorException * @throws InvalidSmsRoleAccessPolicyException * @throws InvalidSmsRoleTrustRelationshipException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2543,6 +2557,7 @@ InitiateAuthResult initiateAuth(InitiateAuthRequest initiateAuthRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2850,6 +2865,7 @@ ListUsersInGroupResult listUsersInGroup(ListUsersInGroupRequest listUsersInGroup * @throws CodeDeliveryFailureException * @throws UserNotFoundException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2918,6 +2934,7 @@ ResendConfirmationCodeResult resendConfirmationCode( * @throws AliasExistsException * @throws InternalErrorException * @throws SoftwareTokenMFANotFoundException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2946,6 +2963,7 @@ RespondToAuthChallengeResult respondToAuthChallenge( * @throws InvalidParameterException * @throws UnsupportedOperationException * @throws UnsupportedTokenTypeException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3060,6 +3078,7 @@ SetUICustomizationResult setUICustomization(SetUICustomizationRequest setUICusto * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3146,6 +3165,7 @@ SetUserPoolMfaConfigResult setUserPoolMfaConfig( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3207,6 +3227,7 @@ SetUserSettingsResult setUserSettings(SetUserSettingsRequest setUserSettingsRequ * @throws InvalidSmsRoleTrustRelationshipException * @throws InvalidEmailRoleAccessPolicyException * @throws CodeDeliveryFailureException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3392,6 +3413,7 @@ UpdateAuthEventFeedbackResult updateAuthEventFeedback( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3544,6 +3566,7 @@ UpdateResourceServerResult updateResourceServer( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3755,6 +3778,7 @@ UpdateUserPoolDomainResult updateUserPoolDomain( * @throws NotAuthorizedException * @throws SoftwareTokenMFANotFoundException * @throws CodeMismatchException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3797,6 +3821,7 @@ VerifySoftwareTokenResult verifySoftwareToken( * @throws UserNotConfirmedException * @throws InternalErrorException * @throws AliasExistsException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProviderClient.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProviderClient.java index b9fc92ad4a..1afee69b45 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProviderClient.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/AmazonCognitoIdentityProviderClient.java @@ -352,6 +352,7 @@ private void init() { jsonErrorUnmarshallers.add(new DuplicateProviderExceptionUnmarshaller()); jsonErrorUnmarshallers.add(new EnableSoftwareTokenMFAExceptionUnmarshaller()); jsonErrorUnmarshallers.add(new ExpiredCodeExceptionUnmarshaller()); + jsonErrorUnmarshallers.add(new ForbiddenExceptionUnmarshaller()); jsonErrorUnmarshallers.add(new GroupExistsExceptionUnmarshaller()); jsonErrorUnmarshallers.add(new InternalErrorExceptionUnmarshaller()); jsonErrorUnmarshallers.add(new InvalidEmailRoleAccessPolicyExceptionUnmarshaller()); @@ -2239,9 +2240,9 @@ public AdminUserGlobalSignOutResult adminUserGlobalSignOut( /** *

- * Begins setup of time-based one-time password multi-factor authentication - * (TOTP MFA) for a user, with a unique private key that Amazon Cognito - * generates and returns in the API response. You can authorize an + * Begins setup of time-based one-time password (TOTP) multi-factor + * authentication (MFA) for a user, with a unique private key that Amazon + * Cognito generates and returns in the API response. You can authorize an * AssociateSoftwareToken request with either the user's access * token, or a session string from a challenge response that you received * from Amazon Cognito. @@ -2276,6 +2277,7 @@ public AdminUserGlobalSignOutResult adminUserGlobalSignOut( * @throws ResourceNotFoundException * @throws InternalErrorException * @throws SoftwareTokenMFANotFoundException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2335,6 +2337,7 @@ public AssociateSoftwareTokenResult associateSoftwareToken( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2395,6 +2398,7 @@ public ChangePasswordResult changePassword(ChangePasswordRequest changePasswordR * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2459,6 +2463,7 @@ public ConfirmDeviceResult confirmDevice(ConfirmDeviceRequest confirmDeviceReque * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -2522,6 +2527,7 @@ public ConfirmForgotPasswordResult confirmForgotPassword( * @throws LimitExceededException * @throws UserNotFoundException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3131,6 +3137,7 @@ public void deleteResourceServer(DeleteResourceServerRequest deleteResourceServe * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3182,6 +3189,7 @@ public void deleteUser(DeleteUserRequest deleteUserRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3759,6 +3767,7 @@ public DescribeUserPoolDomainResult describeUserPoolDomain( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3851,6 +3860,7 @@ public void forgetDevice(ForgetDeviceRequest forgetDeviceRequest) * @throws CodeDeliveryFailureException * @throws UserNotFoundException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -3961,6 +3971,7 @@ public GetCSVHeaderResult getCSVHeader(GetCSVHeaderRequest getCSVHeaderRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -4232,6 +4243,7 @@ public GetUICustomizationResult getUICustomization( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -4323,6 +4335,7 @@ public GetUserResult getUser(GetUserRequest getUserRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -4437,6 +4450,7 @@ public GetUserPoolMfaConfigResult getUserPoolMfaConfig( * @throws PasswordResetRequiredException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -4527,6 +4541,7 @@ public GlobalSignOutResult globalSignOut(GlobalSignOutRequest globalSignOutReque * @throws InternalErrorException * @throws InvalidSmsRoleAccessPolicyException * @throws InvalidSmsRoleTrustRelationshipException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -4584,6 +4599,7 @@ public InitiateAuthResult initiateAuth(InitiateAuthRequest initiateAuthRequest) * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -5157,6 +5173,7 @@ public ListUsersInGroupResult listUsersInGroup(ListUsersInGroupRequest listUsers * @throws CodeDeliveryFailureException * @throws UserNotFoundException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -5252,6 +5269,7 @@ public ResendConfirmationCodeResult resendConfirmationCode( * @throws AliasExistsException * @throws InternalErrorException * @throws SoftwareTokenMFANotFoundException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -5307,6 +5325,7 @@ public RespondToAuthChallengeResult respondToAuthChallenge( * @throws InvalidParameterException * @throws UnsupportedOperationException * @throws UnsupportedTokenTypeException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -5502,6 +5521,7 @@ public SetUICustomizationResult setUICustomization( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -5642,6 +5662,7 @@ public SetUserPoolMfaConfigResult setUserPoolMfaConfig( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -5729,6 +5750,7 @@ public SetUserSettingsResult setUserSettings(SetUserSettingsRequest setUserSetti * @throws InvalidSmsRoleTrustRelationshipException * @throws InvalidEmailRoleAccessPolicyException * @throws CodeDeliveryFailureException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -6075,6 +6097,7 @@ public UpdateAuthEventFeedbackResult updateAuthEventFeedback( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -6335,6 +6358,7 @@ public UpdateResourceServerResult updateResourceServer( * @throws UserNotFoundException * @throws UserNotConfirmedException * @throws InternalErrorException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -6653,6 +6677,7 @@ public UpdateUserPoolDomainResult updateUserPoolDomain( * @throws NotAuthorizedException * @throws SoftwareTokenMFANotFoundException * @throws CodeMismatchException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is @@ -6722,6 +6747,7 @@ public VerifySoftwareTokenResult verifySoftwareToken( * @throws UserNotConfirmedException * @throws InternalErrorException * @throws AliasExistsException + * @throws ForbiddenException * @throws AmazonClientException If any internal errors are encountered * inside the client while attempting to make the request or * handle the response. For example if a network connection is diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenRequest.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenRequest.java index 4567a4cbaf..3cfc155df4 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenRequest.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenRequest.java @@ -21,9 +21,9 @@ /** *

- * Begins setup of time-based one-time password multi-factor authentication - * (TOTP MFA) for a user, with a unique private key that Amazon Cognito - * generates and returns in the API response. You can authorize an + * Begins setup of time-based one-time password (TOTP) multi-factor + * authentication (MFA) for a user, with a unique private key that Amazon + * Cognito generates and returns in the API response. You can authorize an * AssociateSoftwareToken request with either the user's access * token, or a session string from a challenge response that you received from * Amazon Cognito. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenResult.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenResult.java index 9e1f3ce79d..74b1a2b329 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenResult.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/AssociateSoftwareTokenResult.java @@ -20,8 +20,8 @@ public class AssociateSoftwareTokenResult implements Serializable { /** *

- * A unique generated shared secret code that is used in the time-based - * one-time password (TOTP) algorithm to generate a one-time code. + * A unique generated shared secret code that is used in the TOTP algorithm + * to generate a one-time code. *

*

* Constraints:
@@ -44,8 +44,8 @@ public class AssociateSoftwareTokenResult implements Serializable { /** *

- * A unique generated shared secret code that is used in the time-based - * one-time password (TOTP) algorithm to generate a one-time code. + * A unique generated shared secret code that is used in the TOTP algorithm + * to generate a one-time code. *

*

* Constraints:
@@ -53,9 +53,8 @@ public class AssociateSoftwareTokenResult implements Serializable { * Pattern: [A-Za-z0-9]+
* * @return

- * A unique generated shared secret code that is used in the - * time-based one-time password (TOTP) algorithm to generate a - * one-time code. + * A unique generated shared secret code that is used in the TOTP + * algorithm to generate a one-time code. *

*/ public String getSecretCode() { @@ -64,8 +63,8 @@ public String getSecretCode() { /** *

- * A unique generated shared secret code that is used in the time-based - * one-time password (TOTP) algorithm to generate a one-time code. + * A unique generated shared secret code that is used in the TOTP algorithm + * to generate a one-time code. *

*

* Constraints:
@@ -73,9 +72,8 @@ public String getSecretCode() { * Pattern: [A-Za-z0-9]+
* * @param secretCode

- * A unique generated shared secret code that is used in the - * time-based one-time password (TOTP) algorithm to generate a - * one-time code. + * A unique generated shared secret code that is used in the TOTP + * algorithm to generate a one-time code. *

*/ public void setSecretCode(String secretCode) { @@ -84,8 +82,8 @@ public void setSecretCode(String secretCode) { /** *

- * A unique generated shared secret code that is used in the time-based - * one-time password (TOTP) algorithm to generate a one-time code. + * A unique generated shared secret code that is used in the TOTP algorithm + * to generate a one-time code. *

*

* Returns a reference to this object so that method calls can be chained @@ -96,9 +94,8 @@ public void setSecretCode(String secretCode) { * Pattern: [A-Za-z0-9]+
* * @param secretCode

- * A unique generated shared secret code that is used in the - * time-based one-time password (TOTP) algorithm to generate a - * one-time code. + * A unique generated shared secret code that is used in the TOTP + * algorithm to generate a one-time code. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ConfirmForgotPasswordRequest.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ConfirmForgotPasswordRequest.java index ccdd1ae903..969525514e 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ConfirmForgotPasswordRequest.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ConfirmForgotPasswordRequest.java @@ -63,8 +63,8 @@ public class ConfirmForgotPasswordRequest extends AmazonWebServiceRequest implem /** *

- * The confirmation code sent by a user's request to retrieve a forgotten - * password. For more information, see ForgotPassword. *

@@ -77,7 +77,7 @@ public class ConfirmForgotPasswordRequest extends AmazonWebServiceRequest implem /** *

- * The password sent by a user's request to retrieve a forgotten password. + * The new password that your user wants to set. *

*

* Constraints:
@@ -348,8 +348,8 @@ public ConfirmForgotPasswordRequest withUsername(String username) { /** *

- * The confirmation code sent by a user's request to retrieve a forgotten - * password. For more information, see ForgotPassword. *

@@ -359,8 +359,8 @@ public ConfirmForgotPasswordRequest withUsername(String username) { * Pattern: [\S]+
* * @return

- * The confirmation code sent by a user's request to retrieve a - * forgotten password. For more information, see ForgotPassword. *

@@ -371,8 +371,8 @@ public String getConfirmationCode() { /** *

- * The confirmation code sent by a user's request to retrieve a forgotten - * password. For more information, see ForgotPassword. *

@@ -382,8 +382,8 @@ public String getConfirmationCode() { * Pattern: [\S]+
* * @param confirmationCode

- * The confirmation code sent by a user's request to retrieve a - * forgotten password. For more information, see ForgotPassword. *

@@ -394,8 +394,8 @@ public void setConfirmationCode(String confirmationCode) { /** *

- * The confirmation code sent by a user's request to retrieve a forgotten - * password. For more information, see ForgotPassword. *

@@ -408,8 +408,8 @@ public void setConfirmationCode(String confirmationCode) { * Pattern: [\S]+
* * @param confirmationCode

- * The confirmation code sent by a user's request to retrieve a - * forgotten password. For more information, see ForgotPassword. *

@@ -423,7 +423,7 @@ public ConfirmForgotPasswordRequest withConfirmationCode(String confirmationCode /** *

- * The password sent by a user's request to retrieve a forgotten password. + * The new password that your user wants to set. *

*

* Constraints:
@@ -431,8 +431,7 @@ public ConfirmForgotPasswordRequest withConfirmationCode(String confirmationCode * Pattern: [\S]+
* * @return

- * The password sent by a user's request to retrieve a forgotten - * password. + * The new password that your user wants to set. *

*/ public String getPassword() { @@ -441,7 +440,7 @@ public String getPassword() { /** *

- * The password sent by a user's request to retrieve a forgotten password. + * The new password that your user wants to set. *

*

* Constraints:
@@ -449,8 +448,7 @@ public String getPassword() { * Pattern: [\S]+
* * @param password

- * The password sent by a user's request to retrieve a forgotten - * password. + * The new password that your user wants to set. *

*/ public void setPassword(String password) { @@ -459,7 +457,7 @@ public void setPassword(String password) { /** *

- * The password sent by a user's request to retrieve a forgotten password. + * The new password that your user wants to set. *

*

* Returns a reference to this object so that method calls can be chained @@ -470,8 +468,7 @@ public void setPassword(String password) { * Pattern: [\S]+
* * @param password

- * The password sent by a user's request to retrieve a forgotten - * password. + * The new password that your user wants to set. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolClientRequest.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolClientRequest.java index cd63fb78f1..d3527822db 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolClientRequest.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolClientRequest.java @@ -181,55 +181,61 @@ public class CreateUserPoolClientRequest extends AmazonWebServiceRequest impleme *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin based user - * password authentication flow ADMIN_USER_PASSWORD_AUTH. This - * setting replaces the ADMIN_NO_SRP_AUTH setting. With this - * authentication flow, Amazon Cognito receives the password in the request - * instead of using the Secure Remote Password (SRP) protocol to verify - * passwords. + * Enable admin based user password authentication flow + * ADMIN_USER_PASSWORD_AUTH. This setting replaces the + * ADMIN_NO_SRP_AUTH setting. With this authentication flow, + * Amazon Cognito receives the password in the request instead of using the + * Secure Remote Password (SRP) protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user password-based - * authentication. In this flow, Amazon Cognito receives the password in the - * request instead of using the SRP protocol to verify passwords. + * Enable user password-based authentication. In this flow, Amazon Cognito + * receives the password in the request instead of using the SRP protocol to + * verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

- * If you don't specify a value for ExplicitAuthFlows, your app - * client activates the ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * If you don't specify a value for ExplicitAuthFlows, your + * user client supports ALLOW_USER_SRP_AUTH and + * ALLOW_CUSTOM_AUTH. *

*/ private java.util.List explicitAuthFlows; /** *

- * A list of provider names for the IdPs that this client supports. The - * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * A list of provider names for the identity providers (IdPs) that are + * supported on this client. The following are supported: + * COGNITO, Facebook, Google, + * SignInWithApple, and LoginWithAmazon. You can + * also specify the names that you configured for the SAML and OIDC IdPs in + * your user pool, for example MySAMLIdP or + * MyOIDCIdP. *

*/ private java.util.List supportedIdentityProviders; @@ -1379,45 +1385,48 @@ public CreateUserPoolClientRequest withWriteAttributes( *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin based user - * password authentication flow ADMIN_USER_PASSWORD_AUTH. This - * setting replaces the ADMIN_NO_SRP_AUTH setting. With this - * authentication flow, Amazon Cognito receives the password in the request - * instead of using the Secure Remote Password (SRP) protocol to verify - * passwords. + * Enable admin based user password authentication flow + * ADMIN_USER_PASSWORD_AUTH. This setting replaces the + * ADMIN_NO_SRP_AUTH setting. With this authentication flow, + * Amazon Cognito receives the password in the request instead of using the + * Secure Remote Password (SRP) protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user password-based - * authentication. In this flow, Amazon Cognito receives the password in the - * request instead of using the SRP protocol to verify passwords. + * Enable user password-based authentication. In this flow, Amazon Cognito + * receives the password in the request instead of using the SRP protocol to + * verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

- * If you don't specify a value for ExplicitAuthFlows, your app - * client activates the ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * If you don't specify a value for ExplicitAuthFlows, your + * user client supports ALLOW_USER_SRP_AUTH and + * ALLOW_CUSTOM_AUTH. *

* * @return

@@ -1435,49 +1444,49 @@ public CreateUserPoolClientRequest withWriteAttributes( *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin based - * user password authentication flow + * Enable admin based user password authentication flow * ADMIN_USER_PASSWORD_AUTH. This setting replaces the * ADMIN_NO_SRP_AUTH setting. With this authentication * flow, Amazon Cognito receives the password in the request instead * of using the Secure Remote Password (SRP) protocol to verify * passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user password-based - * authentication. In this flow, Amazon Cognito receives the - * password in the request instead of using the SRP protocol to - * verify passwords. + * Enable user password-based authentication. In this flow, Amazon + * Cognito receives the password in the request instead of using the + * SRP protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based - * authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to refresh - * tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

* If you don't specify a value for ExplicitAuthFlows, - * your app client activates the ALLOW_USER_SRP_AUTH - * and ALLOW_CUSTOM_AUTH authentication flows. + * your user client supports ALLOW_USER_SRP_AUTH and + * ALLOW_CUSTOM_AUTH. *

*/ public java.util.List getExplicitAuthFlows() { @@ -1499,45 +1508,48 @@ public java.util.List getExplicitAuthFlows() { *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin based user - * password authentication flow ADMIN_USER_PASSWORD_AUTH. This - * setting replaces the ADMIN_NO_SRP_AUTH setting. With this - * authentication flow, Amazon Cognito receives the password in the request - * instead of using the Secure Remote Password (SRP) protocol to verify - * passwords. + * Enable admin based user password authentication flow + * ADMIN_USER_PASSWORD_AUTH. This setting replaces the + * ADMIN_NO_SRP_AUTH setting. With this authentication flow, + * Amazon Cognito receives the password in the request instead of using the + * Secure Remote Password (SRP) protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user password-based - * authentication. In this flow, Amazon Cognito receives the password in the - * request instead of using the SRP protocol to verify passwords. + * Enable user password-based authentication. In this flow, Amazon Cognito + * receives the password in the request instead of using the SRP protocol to + * verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

- * If you don't specify a value for ExplicitAuthFlows, your app - * client activates the ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * If you don't specify a value for ExplicitAuthFlows, your + * user client supports ALLOW_USER_SRP_AUTH and + * ALLOW_CUSTOM_AUTH. *

* * @param explicitAuthFlows

@@ -1555,50 +1567,50 @@ public java.util.List getExplicitAuthFlows() { *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin - * based user password authentication flow + * Enable admin based user password authentication flow * ADMIN_USER_PASSWORD_AUTH. This setting replaces * the ADMIN_NO_SRP_AUTH setting. With this * authentication flow, Amazon Cognito receives the password in * the request instead of using the Secure Remote Password (SRP) * protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user - * password-based authentication. In this flow, Amazon Cognito - * receives the password in the request instead of using the SRP - * protocol to verify passwords. + * Enable user password-based authentication. In this flow, + * Amazon Cognito receives the password in the request instead of + * using the SRP protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based - * authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to - * refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

* If you don't specify a value for - * ExplicitAuthFlows, your app client activates the + * ExplicitAuthFlows, your user client supports * ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * ALLOW_CUSTOM_AUTH. *

*/ public void setExplicitAuthFlows(java.util.Collection explicitAuthFlows) { @@ -1625,45 +1637,48 @@ public void setExplicitAuthFlows(java.util.Collection explicitAuthFlows) *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin based user - * password authentication flow ADMIN_USER_PASSWORD_AUTH. This - * setting replaces the ADMIN_NO_SRP_AUTH setting. With this - * authentication flow, Amazon Cognito receives the password in the request - * instead of using the Secure Remote Password (SRP) protocol to verify - * passwords. + * Enable admin based user password authentication flow + * ADMIN_USER_PASSWORD_AUTH. This setting replaces the + * ADMIN_NO_SRP_AUTH setting. With this authentication flow, + * Amazon Cognito receives the password in the request instead of using the + * Secure Remote Password (SRP) protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user password-based - * authentication. In this flow, Amazon Cognito receives the password in the - * request instead of using the SRP protocol to verify passwords. + * Enable user password-based authentication. In this flow, Amazon Cognito + * receives the password in the request instead of using the SRP protocol to + * verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

- * If you don't specify a value for ExplicitAuthFlows, your app - * client activates the ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * If you don't specify a value for ExplicitAuthFlows, your + * user client supports ALLOW_USER_SRP_AUTH and + * ALLOW_CUSTOM_AUTH. *

*

* Returns a reference to this object so that method calls can be chained @@ -1684,50 +1699,50 @@ public void setExplicitAuthFlows(java.util.Collection explicitAuthFlows) *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin - * based user password authentication flow + * Enable admin based user password authentication flow * ADMIN_USER_PASSWORD_AUTH. This setting replaces * the ADMIN_NO_SRP_AUTH setting. With this * authentication flow, Amazon Cognito receives the password in * the request instead of using the Secure Remote Password (SRP) * protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user - * password-based authentication. In this flow, Amazon Cognito - * receives the password in the request instead of using the SRP - * protocol to verify passwords. + * Enable user password-based authentication. In this flow, + * Amazon Cognito receives the password in the request instead of + * using the SRP protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based - * authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to - * refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

* If you don't specify a value for - * ExplicitAuthFlows, your app client activates the + * ExplicitAuthFlows, your user client supports * ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * ALLOW_CUSTOM_AUTH. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -1757,45 +1772,48 @@ public CreateUserPoolClientRequest withExplicitAuthFlows(String... explicitAuthF *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin based user - * password authentication flow ADMIN_USER_PASSWORD_AUTH. This - * setting replaces the ADMIN_NO_SRP_AUTH setting. With this - * authentication flow, Amazon Cognito receives the password in the request - * instead of using the Secure Remote Password (SRP) protocol to verify - * passwords. + * Enable admin based user password authentication flow + * ADMIN_USER_PASSWORD_AUTH. This setting replaces the + * ADMIN_NO_SRP_AUTH setting. With this authentication flow, + * Amazon Cognito receives the password in the request instead of using the + * Secure Remote Password (SRP) protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user password-based - * authentication. In this flow, Amazon Cognito receives the password in the - * request instead of using the SRP protocol to verify passwords. + * Enable user password-based authentication. In this flow, Amazon Cognito + * receives the password in the request instead of using the SRP protocol to + * verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

- * If you don't specify a value for ExplicitAuthFlows, your app - * client activates the ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * If you don't specify a value for ExplicitAuthFlows, your + * user client supports ALLOW_USER_SRP_AUTH and + * ALLOW_CUSTOM_AUTH. *

*

* Returns a reference to this object so that method calls can be chained @@ -1816,50 +1834,50 @@ public CreateUserPoolClientRequest withExplicitAuthFlows(String... explicitAuthF *

* Valid values include: *

- *
    - *
  • + *
    + *
    ALLOW_ADMIN_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_ADMIN_USER_PASSWORD_AUTH: Enable admin - * based user password authentication flow + * Enable admin based user password authentication flow * ADMIN_USER_PASSWORD_AUTH. This setting replaces * the ADMIN_NO_SRP_AUTH setting. With this * authentication flow, Amazon Cognito receives the password in * the request instead of using the Secure Remote Password (SRP) * protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_CUSTOM_AUTH
    + *
    *

    - * ALLOW_CUSTOM_AUTH: Enable Lambda trigger based - * authentication. + * Enable Lambda trigger based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_USER_PASSWORD_AUTH
    + *
    *

    - * ALLOW_USER_PASSWORD_AUTH: Enable user - * password-based authentication. In this flow, Amazon Cognito - * receives the password in the request instead of using the SRP - * protocol to verify passwords. + * Enable user password-based authentication. In this flow, + * Amazon Cognito receives the password in the request instead of + * using the SRP protocol to verify passwords. *

    - *
    • - *
  • + * + *
    ALLOW_USER_SRP_AUTH
    + *
    *

    - * ALLOW_USER_SRP_AUTH: Enable SRP-based - * authentication. + * Enable SRP-based authentication. *

    - *
    • - *
  • + * + *
    ALLOW_REFRESH_TOKEN_AUTH
    + *
    *

    - * ALLOW_REFRESH_TOKEN_AUTH: Enable authflow to - * refresh tokens. + * Enable the authflow that refreshes tokens. *

    - *
    • - *
+ * + * *

* If you don't specify a value for - * ExplicitAuthFlows, your app client activates the + * ExplicitAuthFlows, your user client supports * ALLOW_USER_SRP_AUTH and - * ALLOW_CUSTOM_AUTH authentication flows. + * ALLOW_CUSTOM_AUTH. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -1872,18 +1890,23 @@ public CreateUserPoolClientRequest withExplicitAuthFlows( /** *

- * A list of provider names for the IdPs that this client supports. The - * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * A list of provider names for the identity providers (IdPs) that are + * supported on this client. The following are supported: + * COGNITO, Facebook, Google, + * SignInWithApple, and LoginWithAmazon. You can + * also specify the names that you configured for the SAML and OIDC IdPs in + * your user pool, for example MySAMLIdP or + * MyOIDCIdP. *

* * @return

- * A list of provider names for the IdPs that this client supports. - * The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML and - * OIDC providers. + * A list of provider names for the identity providers (IdPs) that + * are supported on this client. The following are supported: + * COGNITO, Facebook, Google, + * SignInWithApple, and LoginWithAmazon. + * You can also specify the names that you configured for the SAML + * and OIDC IdPs in your user pool, for example + * MySAMLIdP or MyOIDCIdP. *

*/ public java.util.List getSupportedIdentityProviders() { @@ -1892,18 +1915,24 @@ public java.util.List getSupportedIdentityProviders() { /** *

- * A list of provider names for the IdPs that this client supports. The - * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * A list of provider names for the identity providers (IdPs) that are + * supported on this client. The following are supported: + * COGNITO, Facebook, Google, + * SignInWithApple, and LoginWithAmazon. You can + * also specify the names that you configured for the SAML and OIDC IdPs in + * your user pool, for example MySAMLIdP or + * MyOIDCIdP. *

* * @param supportedIdentityProviders

- * A list of provider names for the IdPs that this client - * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * A list of provider names for the identity providers (IdPs) + * that are supported on this client. The following are + * supported: COGNITO, Facebook, + * Google, SignInWithApple, and + * LoginWithAmazon. You can also specify the names + * that you configured for the SAML and OIDC IdPs in your user + * pool, for example MySAMLIdP or + * MyOIDCIdP. *

*/ public void setSupportedIdentityProviders( @@ -1919,21 +1948,27 @@ public void setSupportedIdentityProviders( /** *

- * A list of provider names for the IdPs that this client supports. The - * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * A list of provider names for the identity providers (IdPs) that are + * supported on this client. The following are supported: + * COGNITO, Facebook, Google, + * SignInWithApple, and LoginWithAmazon. You can + * also specify the names that you configured for the SAML and OIDC IdPs in + * your user pool, for example MySAMLIdP or + * MyOIDCIdP. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param supportedIdentityProviders

- * A list of provider names for the IdPs that this client - * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * A list of provider names for the identity providers (IdPs) + * that are supported on this client. The following are + * supported: COGNITO, Facebook, + * Google, SignInWithApple, and + * LoginWithAmazon. You can also specify the names + * that you configured for the SAML and OIDC IdPs in your user + * pool, for example MySAMLIdP or + * MyOIDCIdP. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -1952,21 +1987,27 @@ public CreateUserPoolClientRequest withSupportedIdentityProviders( /** *

- * A list of provider names for the IdPs that this client supports. The - * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * A list of provider names for the identity providers (IdPs) that are + * supported on this client. The following are supported: + * COGNITO, Facebook, Google, + * SignInWithApple, and LoginWithAmazon. You can + * also specify the names that you configured for the SAML and OIDC IdPs in + * your user pool, for example MySAMLIdP or + * MyOIDCIdP. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param supportedIdentityProviders

- * A list of provider names for the IdPs that this client - * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * A list of provider names for the identity providers (IdPs) + * that are supported on this client. The following are + * supported: COGNITO, Facebook, + * Google, SignInWithApple, and + * LoginWithAmazon. You can also specify the names + * that you configured for the SAML and OIDC IdPs in your user + * pool, for example MySAMLIdP or + * MyOIDCIdP. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolRequest.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolRequest.java index dbd86cd590..3a9a8dc0a1 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolRequest.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/CreateUserPoolRequest.java @@ -133,7 +133,7 @@ public class CreateUserPoolRequest extends AmazonWebServiceRequest implements Se /** *

* A string representing the email verification message. - * EmailVerificationMessage is allowed only if EmailVerificationMessage is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -149,7 +149,7 @@ public class CreateUserPoolRequest extends AmazonWebServiceRequest implements Se /** *

* A string representing the email verification subject. - * EmailVerificationSubject is allowed only if EmailVerificationSubject is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -197,15 +197,22 @@ public class CreateUserPoolRequest extends AmazonWebServiceRequest implements Se * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

*/ private UserAttributeUpdateSettingsType userAttributeUpdateSettings; /** *

- * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. *

+ * + *

+ * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. + *

+ * */ private DeviceConfigurationType deviceConfiguration; @@ -871,7 +878,7 @@ public CreateUserPoolRequest withSmsVerificationMessage(String smsVerificationMe /** *

* A string representing the email verification message. - * EmailVerificationMessage is allowed only if EmailVerificationMessage is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -884,7 +891,7 @@ public CreateUserPoolRequest withSmsVerificationMessage(String smsVerificationMe * * @return

* A string representing the email verification message. - * EmailVerificationMessage is allowed only if EmailVerificationMessage is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -896,7 +903,7 @@ public String getEmailVerificationMessage() { /** *

* A string representing the email verification message. - * EmailVerificationMessage is allowed only if EmailVerificationMessage is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -909,7 +916,8 @@ public String getEmailVerificationMessage() { * * @param emailVerificationMessage

* A string representing the email verification message. - * EmailVerificationMessage is allowed only if EmailVerificationMessage is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -921,7 +929,7 @@ public void setEmailVerificationMessage(String emailVerificationMessage) { /** *

* A string representing the email verification message. - * EmailVerificationMessage is allowed only if EmailVerificationMessage is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -937,7 +945,8 @@ public void setEmailVerificationMessage(String emailVerificationMessage) { * * @param emailVerificationMessage

* A string representing the email verification message. - * EmailVerificationMessage is allowed only if EmailVerificationMessage is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -952,7 +961,7 @@ public CreateUserPoolRequest withEmailVerificationMessage(String emailVerificati /** *

* A string representing the email verification subject. - * EmailVerificationSubject is allowed only if EmailVerificationSubject is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -963,7 +972,7 @@ public CreateUserPoolRequest withEmailVerificationMessage(String emailVerificati * * @return

* A string representing the email verification subject. - * EmailVerificationSubject is allowed only if EmailVerificationSubject is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -975,7 +984,7 @@ public String getEmailVerificationSubject() { /** *

* A string representing the email verification subject. - * EmailVerificationSubject is allowed only if EmailVerificationSubject is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -986,7 +995,8 @@ public String getEmailVerificationSubject() { * * @param emailVerificationSubject

* A string representing the email verification subject. - * EmailVerificationSubject is allowed only if EmailVerificationSubject is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -998,7 +1008,7 @@ public void setEmailVerificationSubject(String emailVerificationSubject) { /** *

* A string representing the email verification subject. - * EmailVerificationSubject is allowed only if EmailVerificationSubject is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -1012,7 +1022,8 @@ public void setEmailVerificationSubject(String emailVerificationSubject) { * * @param emailVerificationSubject

* A string representing the email verification subject. - * EmailVerificationSubject is allowed only if EmailVerificationSubject is allowed only if EmailSendingAccount is DEVELOPER. *

@@ -1241,7 +1252,7 @@ public CreateUserPoolRequest withMfaConfiguration(UserPoolMfaType mfaConfigurati * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

* * @return

@@ -1252,7 +1263,7 @@ public CreateUserPoolRequest withMfaConfiguration(UserPoolMfaType mfaConfigurati * to the value of your users' email address and phone number * attributes. For more information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

*/ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { @@ -1267,7 +1278,7 @@ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

* * @param userAttributeUpdateSettings

@@ -1278,8 +1289,7 @@ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { * changes to the value of your users' email address and phone * number attributes. For more information, see Verifying updates to to email addresses and phone - * numbers. + * > Verifying updates to email addresses and phone numbers. *

*/ public void setUserAttributeUpdateSettings( @@ -1295,7 +1305,7 @@ public void setUserAttributeUpdateSettings( * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

*

* Returns a reference to this object so that method calls can be chained @@ -1309,8 +1319,7 @@ public void setUserAttributeUpdateSettings( * changes to the value of your users' email address and phone * number attributes. For more information, see Verifying updates to to email addresses and phone - * numbers. + * > Verifying updates to email addresses and phone numbers. *

* @return A reference to this updated object so that method calls can be * chained together. @@ -1323,12 +1332,28 @@ public CreateUserPoolRequest withUserAttributeUpdateSettings( /** *

- * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. + *

+ * + *

+ * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. *

+ * * * @return

- * The device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering in + * your user pool. + *

+ * + *

+ * When you provide a value for any DeviceConfiguration + * field, you activate the Amazon Cognito device-remembering + * feature. *

+ * */ public DeviceConfigurationType getDeviceConfiguration() { return deviceConfiguration; @@ -1336,12 +1361,28 @@ public DeviceConfigurationType getDeviceConfiguration() { /** *

- * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. + *

+ * + *

+ * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. *

+ * * * @param deviceConfiguration

- * The device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering + * in your user pool. *

+ * + *

+ * When you provide a value for any + * DeviceConfiguration field, you activate the + * Amazon Cognito device-remembering feature. + *

+ * */ public void setDeviceConfiguration(DeviceConfigurationType deviceConfiguration) { this.deviceConfiguration = deviceConfiguration; @@ -1349,15 +1390,31 @@ public void setDeviceConfiguration(DeviceConfigurationType deviceConfiguration) /** *

- * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. + *

+ * + *

+ * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. *

+ * *

* Returns a reference to this object so that method calls can be chained * together. * * @param deviceConfiguration

- * The device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering + * in your user pool. *

+ * + *

+ * When you provide a value for any + * DeviceConfiguration field, you activate the + * Amazon Cognito device-remembering feature. + *

+ * * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/DeviceConfigurationType.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/DeviceConfigurationType.java index 15942011f5..e0f3149ecc 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/DeviceConfigurationType.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/DeviceConfigurationType.java @@ -19,13 +19,13 @@ /** *

- * The device tracking configuration for a user pool. A user pool with device - * tracking deactivated returns a null value. + * The device-remembering configuration for a user pool. A null value indicates + * that you have deactivated device remembering in your user pool. *

* *

- * When you provide values for any DeviceConfiguration field, you activate - * device tracking. + * When you provide a value for any DeviceConfiguration field, you + * activate the Amazon Cognito device-remembering feature. *

* */ @@ -37,9 +37,9 @@ public class DeviceConfigurationType implements Serializable { *

* *

- * Users that sign in with devices that have not been confirmed or - * remembered will still have to provide a second factor, whether or not - * ChallengeRequiredOnNewDevice is true, when your user pool requires MFA. + * Regardless of the value of this field, users that sign in with new + * devices that have not been confirmed or remembered must provide a second + * factor if your user pool requires MFA. *

* */ @@ -47,8 +47,13 @@ public class DeviceConfigurationType implements Serializable { /** *

- * When true, users can opt in to remembering their device. Your app code - * must use callback functions to return the user's choice. + * When true, Amazon Cognito doesn't remember newly-confirmed devices. Users + * who want to authenticate with their device can instead opt in to + * remembering their device. To collect a choice from your user, create an + * input prompt in your app and return the value that the user chooses in an + * UpdateDeviceStatus API request. *

*/ private Boolean deviceOnlyRememberedOnUserPrompt; @@ -60,9 +65,9 @@ public class DeviceConfigurationType implements Serializable { *

* *

- * Users that sign in with devices that have not been confirmed or - * remembered will still have to provide a second factor, whether or not - * ChallengeRequiredOnNewDevice is true, when your user pool requires MFA. + * Regardless of the value of this field, users that sign in with new + * devices that have not been confirmed or remembered must provide a second + * factor if your user pool requires MFA. *

* * @@ -73,10 +78,9 @@ public class DeviceConfigurationType implements Serializable { *

* *

- * Users that sign in with devices that have not been confirmed or - * remembered will still have to provide a second factor, whether or - * not ChallengeRequiredOnNewDevice is true, when your user pool - * requires MFA. + * Regardless of the value of this field, users that sign in with + * new devices that have not been confirmed or remembered must + * provide a second factor if your user pool requires MFA. *

* */ @@ -91,9 +95,9 @@ public Boolean isChallengeRequiredOnNewDevice() { *

* *

- * Users that sign in with devices that have not been confirmed or - * remembered will still have to provide a second factor, whether or not - * ChallengeRequiredOnNewDevice is true, when your user pool requires MFA. + * Regardless of the value of this field, users that sign in with new + * devices that have not been confirmed or remembered must provide a second + * factor if your user pool requires MFA. *

* * @@ -104,10 +108,9 @@ public Boolean isChallengeRequiredOnNewDevice() { *

* *

- * Users that sign in with devices that have not been confirmed or - * remembered will still have to provide a second factor, whether or - * not ChallengeRequiredOnNewDevice is true, when your user pool - * requires MFA. + * Regardless of the value of this field, users that sign in with + * new devices that have not been confirmed or remembered must + * provide a second factor if your user pool requires MFA. *

* */ @@ -122,9 +125,9 @@ public Boolean getChallengeRequiredOnNewDevice() { *

* *

- * Users that sign in with devices that have not been confirmed or - * remembered will still have to provide a second factor, whether or not - * ChallengeRequiredOnNewDevice is true, when your user pool requires MFA. + * Regardless of the value of this field, users that sign in with new + * devices that have not been confirmed or remembered must provide a second + * factor if your user pool requires MFA. *

* * @@ -135,10 +138,9 @@ public Boolean getChallengeRequiredOnNewDevice() { *

* *

- * Users that sign in with devices that have not been confirmed - * or remembered will still have to provide a second factor, - * whether or not ChallengeRequiredOnNewDevice is true, when your - * user pool requires MFA. + * Regardless of the value of this field, users that sign in with + * new devices that have not been confirmed or remembered must + * provide a second factor if your user pool requires MFA. *

* */ @@ -153,9 +155,9 @@ public void setChallengeRequiredOnNewDevice(Boolean challengeRequiredOnNewDevice *

* *

- * Users that sign in with devices that have not been confirmed or - * remembered will still have to provide a second factor, whether or not - * ChallengeRequiredOnNewDevice is true, when your user pool requires MFA. + * Regardless of the value of this field, users that sign in with new + * devices that have not been confirmed or remembered must provide a second + * factor if your user pool requires MFA. *

* *

@@ -169,10 +171,9 @@ public void setChallengeRequiredOnNewDevice(Boolean challengeRequiredOnNewDevice *

* *

- * Users that sign in with devices that have not been confirmed - * or remembered will still have to provide a second factor, - * whether or not ChallengeRequiredOnNewDevice is true, when your - * user pool requires MFA. + * Regardless of the value of this field, users that sign in with + * new devices that have not been confirmed or remembered must + * provide a second factor if your user pool requires MFA. *

* * @return A reference to this updated object so that method calls can be @@ -186,13 +187,23 @@ public DeviceConfigurationType withChallengeRequiredOnNewDevice( /** *

- * When true, users can opt in to remembering their device. Your app code - * must use callback functions to return the user's choice. + * When true, Amazon Cognito doesn't remember newly-confirmed devices. Users + * who want to authenticate with their device can instead opt in to + * remembering their device. To collect a choice from your user, create an + * input prompt in your app and return the value that the user chooses in an + * UpdateDeviceStatus API request. *

* * @return

- * When true, users can opt in to remembering their device. Your app - * code must use callback functions to return the user's choice. + * When true, Amazon Cognito doesn't remember newly-confirmed + * devices. Users who want to authenticate with their device can + * instead opt in to remembering their device. To collect a choice + * from your user, create an input prompt in your app and return the + * value that the user chooses in an UpdateDeviceStatus API request. *

*/ public Boolean isDeviceOnlyRememberedOnUserPrompt() { @@ -201,13 +212,23 @@ public Boolean isDeviceOnlyRememberedOnUserPrompt() { /** *

- * When true, users can opt in to remembering their device. Your app code - * must use callback functions to return the user's choice. + * When true, Amazon Cognito doesn't remember newly-confirmed devices. Users + * who want to authenticate with their device can instead opt in to + * remembering their device. To collect a choice from your user, create an + * input prompt in your app and return the value that the user chooses in an + * UpdateDeviceStatus API request. *

* * @return

- * When true, users can opt in to remembering their device. Your app - * code must use callback functions to return the user's choice. + * When true, Amazon Cognito doesn't remember newly-confirmed + * devices. Users who want to authenticate with their device can + * instead opt in to remembering their device. To collect a choice + * from your user, create an input prompt in your app and return the + * value that the user chooses in an UpdateDeviceStatus API request. *

*/ public Boolean getDeviceOnlyRememberedOnUserPrompt() { @@ -216,14 +237,23 @@ public Boolean getDeviceOnlyRememberedOnUserPrompt() { /** *

- * When true, users can opt in to remembering their device. Your app code - * must use callback functions to return the user's choice. + * When true, Amazon Cognito doesn't remember newly-confirmed devices. Users + * who want to authenticate with their device can instead opt in to + * remembering their device. To collect a choice from your user, create an + * input prompt in your app and return the value that the user chooses in an + * UpdateDeviceStatus API request. *

* * @param deviceOnlyRememberedOnUserPrompt

- * When true, users can opt in to remembering their device. Your - * app code must use callback functions to return the user's - * choice. + * When true, Amazon Cognito doesn't remember newly-confirmed + * devices. Users who want to authenticate with their device can + * instead opt in to remembering their device. To collect a + * choice from your user, create an input prompt in your app and + * return the value that the user chooses in an UpdateDeviceStatus API request. *

*/ public void setDeviceOnlyRememberedOnUserPrompt(Boolean deviceOnlyRememberedOnUserPrompt) { @@ -232,17 +262,26 @@ public void setDeviceOnlyRememberedOnUserPrompt(Boolean deviceOnlyRememberedOnUs /** *

- * When true, users can opt in to remembering their device. Your app code - * must use callback functions to return the user's choice. + * When true, Amazon Cognito doesn't remember newly-confirmed devices. Users + * who want to authenticate with their device can instead opt in to + * remembering their device. To collect a choice from your user, create an + * input prompt in your app and return the value that the user chooses in an + * UpdateDeviceStatus API request. *

*

* Returns a reference to this object so that method calls can be chained * together. * * @param deviceOnlyRememberedOnUserPrompt

- * When true, users can opt in to remembering their device. Your - * app code must use callback functions to return the user's - * choice. + * When true, Amazon Cognito doesn't remember newly-confirmed + * devices. Users who want to authenticate with their device can + * instead opt in to remembering their device. To collect a + * choice from your user, create an input prompt in your app and + * return the value that the user chooses in an UpdateDeviceStatus API request. *

* @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ForbiddenException.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ForbiddenException.java new file mode 100644 index 0000000000..6456ece35d --- /dev/null +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/ForbiddenException.java @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.cognitoidentityprovider.model; + +import com.amazonaws.AmazonServiceException; + +/** + *

+ * This exception is thrown when WAF doesn't allow your request based on a web + * ACL that's associated with your user pool. + *

+ */ +public class ForbiddenException extends AmazonServiceException { + private static final long serialVersionUID = 1L; + + /** + * Constructs a new ForbiddenException with the specified error message. + * + * @param message Describes the error encountered. + */ + public ForbiddenException(String message) { + super(message); + } +} diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/GetUserPoolMfaConfigResult.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/GetUserPoolMfaConfigResult.java index 919dbbe1c6..b479d09efa 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/GetUserPoolMfaConfigResult.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/GetUserPoolMfaConfigResult.java @@ -20,21 +20,22 @@ public class GetUserPoolMfaConfigResult implements Serializable { /** *

- * The SMS text message multi-factor (MFA) configuration. + * The SMS text message multi-factor authentication (MFA) configuration. *

*/ private SmsMfaConfigType smsMfaConfiguration; /** *

- * The software token multi-factor (MFA) configuration. + * The software token multi-factor authentication (MFA) configuration. *

*/ private SoftwareTokenMfaConfigType softwareTokenMfaConfiguration; /** *

- * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid values + * include: *

*
    *
  • @@ -62,11 +63,12 @@ public class GetUserPoolMfaConfigResult implements Serializable { /** *

    - * The SMS text message multi-factor (MFA) configuration. + * The SMS text message multi-factor authentication (MFA) configuration. *

    * * @return

    - * The SMS text message multi-factor (MFA) configuration. + * The SMS text message multi-factor authentication (MFA) + * configuration. *

    */ public SmsMfaConfigType getSmsMfaConfiguration() { @@ -75,11 +77,12 @@ public SmsMfaConfigType getSmsMfaConfiguration() { /** *

    - * The SMS text message multi-factor (MFA) configuration. + * The SMS text message multi-factor authentication (MFA) configuration. *

    * * @param smsMfaConfiguration

    - * The SMS text message multi-factor (MFA) configuration. + * The SMS text message multi-factor authentication (MFA) + * configuration. *

    */ public void setSmsMfaConfiguration(SmsMfaConfigType smsMfaConfiguration) { @@ -88,14 +91,15 @@ public void setSmsMfaConfiguration(SmsMfaConfigType smsMfaConfiguration) { /** *

    - * The SMS text message multi-factor (MFA) configuration. + * The SMS text message multi-factor authentication (MFA) configuration. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * * @param smsMfaConfiguration

    - * The SMS text message multi-factor (MFA) configuration. + * The SMS text message multi-factor authentication (MFA) + * configuration. *

    * @return A reference to this updated object so that method calls can be * chained together. @@ -107,11 +111,12 @@ public GetUserPoolMfaConfigResult withSmsMfaConfiguration(SmsMfaConfigType smsMf /** *

    - * The software token multi-factor (MFA) configuration. + * The software token multi-factor authentication (MFA) configuration. *

    * * @return

    - * The software token multi-factor (MFA) configuration. + * The software token multi-factor authentication (MFA) + * configuration. *

    */ public SoftwareTokenMfaConfigType getSoftwareTokenMfaConfiguration() { @@ -120,11 +125,12 @@ public SoftwareTokenMfaConfigType getSoftwareTokenMfaConfiguration() { /** *

    - * The software token multi-factor (MFA) configuration. + * The software token multi-factor authentication (MFA) configuration. *

    * * @param softwareTokenMfaConfiguration

    - * The software token multi-factor (MFA) configuration. + * The software token multi-factor authentication (MFA) + * configuration. *

    */ public void setSoftwareTokenMfaConfiguration( @@ -134,14 +140,15 @@ public void setSoftwareTokenMfaConfiguration( /** *

    - * The software token multi-factor (MFA) configuration. + * The software token multi-factor authentication (MFA) configuration. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * * @param softwareTokenMfaConfiguration

    - * The software token multi-factor (MFA) configuration. + * The software token multi-factor authentication (MFA) + * configuration. *

    * @return A reference to this updated object so that method calls can be * chained together. @@ -154,7 +161,8 @@ public GetUserPoolMfaConfigResult withSoftwareTokenMfaConfiguration( /** *

    - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid values + * include: *

    *
      *
    • @@ -179,7 +187,8 @@ public GetUserPoolMfaConfigResult withSoftwareTokenMfaConfiguration( * Allowed Values: OFF, ON, OPTIONAL * * @return

      - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid values + * include: *

      *
        *
      • @@ -207,7 +216,8 @@ public String getMfaConfiguration() { /** *

        - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid values + * include: *

        *
          *
        • @@ -232,7 +242,8 @@ public String getMfaConfiguration() { * Allowed Values: OFF, ON, OPTIONAL * * @param mfaConfiguration

          - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid + * values include: *

          *
            *
          • @@ -260,7 +271,8 @@ public void setMfaConfiguration(String mfaConfiguration) { /** *

            - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid values + * include: *

            *
              *
            • @@ -288,7 +300,8 @@ public void setMfaConfiguration(String mfaConfiguration) { * Allowed Values: OFF, ON, OPTIONAL * * @param mfaConfiguration

              - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid + * values include: *

              *
                *
              • @@ -319,7 +332,8 @@ public GetUserPoolMfaConfigResult withMfaConfiguration(String mfaConfiguration) /** *

                - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid values + * include: *

                *
                  *
                • @@ -344,7 +358,8 @@ public GetUserPoolMfaConfigResult withMfaConfiguration(String mfaConfiguration) * Allowed Values: OFF, ON, OPTIONAL * * @param mfaConfiguration

                  - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid + * values include: *

                  *
                    *
                  • @@ -372,7 +387,8 @@ public void setMfaConfiguration(UserPoolMfaType mfaConfiguration) { /** *

                    - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid values + * include: *

                    *
                      *
                    • @@ -400,7 +416,8 @@ public void setMfaConfiguration(UserPoolMfaType mfaConfiguration) { * Allowed Values: OFF, ON, OPTIONAL * * @param mfaConfiguration

                      - * The multi-factor (MFA) configuration. Valid values include: + * The multi-factor authentication (MFA) configuration. Valid + * values include: *

                      *
                        *
                      • diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/SetUserMFAPreferenceRequest.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/SetUserMFAPreferenceRequest.java index a1f4e0489d..305b196fe9 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/SetUserMFAPreferenceRequest.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/SetUserMFAPreferenceRequest.java @@ -43,7 +43,7 @@ public class SetUserMFAPreferenceRequest extends AmazonWebServiceRequest impleme /** *

                        - * The time-based one-time password software token MFA settings. + * The time-based one-time password (TOTP) software token MFA settings. *

                        */ private SoftwareTokenMfaSettingsType softwareTokenMfaSettings; @@ -108,11 +108,12 @@ public SetUserMFAPreferenceRequest withSMSMfaSettings(SMSMfaSettingsType sMSMfaS /** *

                        - * The time-based one-time password software token MFA settings. + * The time-based one-time password (TOTP) software token MFA settings. *

                        * * @return

                        - * The time-based one-time password software token MFA settings. + * The time-based one-time password (TOTP) software token MFA + * settings. *

                        */ public SoftwareTokenMfaSettingsType getSoftwareTokenMfaSettings() { @@ -121,11 +122,12 @@ public SoftwareTokenMfaSettingsType getSoftwareTokenMfaSettings() { /** *

                        - * The time-based one-time password software token MFA settings. + * The time-based one-time password (TOTP) software token MFA settings. *

                        * * @param softwareTokenMfaSettings

                        - * The time-based one-time password software token MFA settings. + * The time-based one-time password (TOTP) software token MFA + * settings. *

                        */ public void setSoftwareTokenMfaSettings(SoftwareTokenMfaSettingsType softwareTokenMfaSettings) { @@ -134,14 +136,15 @@ public void setSoftwareTokenMfaSettings(SoftwareTokenMfaSettingsType softwareTok /** *

                        - * The time-based one-time password software token MFA settings. + * The time-based one-time password (TOTP) software token MFA settings. *

                        *

                        * Returns a reference to this object so that method calls can be chained * together. * * @param softwareTokenMfaSettings

                        - * The time-based one-time password software token MFA settings. + * The time-based one-time password (TOTP) software token MFA + * settings. *

                        * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolClientRequest.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolClientRequest.java index 60bfce9c88..93727d63c5 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolClientRequest.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolClientRequest.java @@ -222,8 +222,9 @@ public class UpdateUserPoolClientRequest extends AmazonWebServiceRequest impleme *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        */ private java.util.List supportedIdentityProviders; @@ -1698,16 +1699,17 @@ public UpdateUserPoolClientRequest withExplicitAuthFlows( *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        * * @return

                        * A list of provider names for the IdPs that this client supports. * The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML and - * OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, and + * the names of your own SAML and OIDC providers. *

                        */ public java.util.List getSupportedIdentityProviders() { @@ -1718,16 +1720,17 @@ public java.util.List getSupportedIdentityProviders() { *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        * * @param supportedIdentityProviders

                        * A list of provider names for the IdPs that this client * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, + * and the names of your own SAML and OIDC providers. *

                        */ public void setSupportedIdentityProviders( @@ -1745,8 +1748,9 @@ public void setSupportedIdentityProviders( *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -1755,9 +1759,9 @@ public void setSupportedIdentityProviders( * @param supportedIdentityProviders

                        * A list of provider names for the IdPs that this client * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, + * and the names of your own SAML and OIDC providers. *

                        * @return A reference to this updated object so that method calls can be * chained together. @@ -1778,8 +1782,9 @@ public UpdateUserPoolClientRequest withSupportedIdentityProviders( *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -1788,9 +1793,9 @@ public UpdateUserPoolClientRequest withSupportedIdentityProviders( * @param supportedIdentityProviders

                        * A list of provider names for the IdPs that this client * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, + * and the names of your own SAML and OIDC providers. *

                        * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolRequest.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolRequest.java index bc09757796..41d03799e3 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolRequest.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UpdateUserPoolRequest.java @@ -148,7 +148,7 @@ public class UpdateUserPoolRequest extends AmazonWebServiceRequest implements Se * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        */ private UserAttributeUpdateSettingsType userAttributeUpdateSettings; @@ -189,8 +189,15 @@ public class UpdateUserPoolRequest extends AmazonWebServiceRequest implements Se /** *

                        - * Device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. + *

                        + *                         */ private DeviceConfigurationType deviceConfiguration; @@ -784,7 +791,7 @@ public UpdateUserPoolRequest withSmsAuthenticationMessage(String smsAuthenticati * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        * * @return

                        @@ -795,7 +802,7 @@ public UpdateUserPoolRequest withSmsAuthenticationMessage(String smsAuthenticati * to the value of your users' email address and phone number * attributes. For more information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        */ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { @@ -810,7 +817,7 @@ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        * * @param userAttributeUpdateSettings

                        @@ -821,8 +828,7 @@ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { * changes to the value of your users' email address and phone * number attributes. For more information, see Verifying updates to to email addresses and phone - * numbers. + * > Verifying updates to email addresses and phone numbers. *

                        */ public void setUserAttributeUpdateSettings( @@ -838,7 +844,7 @@ public void setUserAttributeUpdateSettings( * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -852,8 +858,7 @@ public void setUserAttributeUpdateSettings( * changes to the value of your users' email address and phone * number attributes. For more information, see Verifying updates to to email addresses and phone - * numbers. + * > Verifying updates to email addresses and phone numbers. *

                        * @return A reference to this updated object so that method calls can be * chained together. @@ -1203,12 +1208,28 @@ public UpdateUserPoolRequest withMfaConfiguration(UserPoolMfaType mfaConfigurati /** *

                        - * Device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. + *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. *

                        + *                         * * @return

                        - * Device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering in + * your user pool. *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration + * field, you activate the Amazon Cognito device-remembering + * feature. + *

                        + *                         */ public DeviceConfigurationType getDeviceConfiguration() { return deviceConfiguration; @@ -1216,12 +1237,28 @@ public DeviceConfigurationType getDeviceConfiguration() { /** *

                        - * Device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. + *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. *

                        + *                         * * @param deviceConfiguration

                        - * Device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering + * in your user pool. + *

                        + * + *

                        + * When you provide a value for any + * DeviceConfiguration field, you activate the + * Amazon Cognito device-remembering feature. *

                        + *                         */ public void setDeviceConfiguration(DeviceConfigurationType deviceConfiguration) { this.deviceConfiguration = deviceConfiguration; @@ -1229,15 +1266,31 @@ public void setDeviceConfiguration(DeviceConfigurationType deviceConfiguration) /** *

                        - * Device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. + *

                        + *                         *

                        * Returns a reference to this object so that method calls can be chained * together. * * @param deviceConfiguration

                        - * Device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering + * in your user pool. + *

                        + * + *

                        + * When you provide a value for any + * DeviceConfiguration field, you activate the + * Amazon Cognito device-remembering feature. *

                        + *                         * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserAttributeUpdateSettingsType.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserAttributeUpdateSettingsType.java index 7d3f7bf90d..311672c94a 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserAttributeUpdateSettingsType.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserAttributeUpdateSettingsType.java @@ -25,7 +25,7 @@ * users' email address and phone number attributes. For more information, see * Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        */ public class UserAttributeUpdateSettingsType implements Serializable { diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolClientType.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolClientType.java index 3f967b3ca2..9877f709ff 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolClientType.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolClientType.java @@ -228,8 +228,9 @@ public class UserPoolClientType implements Serializable { *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        */ private java.util.List supportedIdentityProviders; @@ -1852,16 +1853,17 @@ public UserPoolClientType withExplicitAuthFlows(java.util.Collection exp *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        * * @return

                        * A list of provider names for the IdPs that this client supports. * The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML and - * OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, and + * the names of your own SAML and OIDC providers. *

                        */ public java.util.List getSupportedIdentityProviders() { @@ -1872,16 +1874,17 @@ public java.util.List getSupportedIdentityProviders() { *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        * * @param supportedIdentityProviders

                        * A list of provider names for the IdPs that this client * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, + * and the names of your own SAML and OIDC providers. *

                        */ public void setSupportedIdentityProviders( @@ -1899,8 +1902,9 @@ public void setSupportedIdentityProviders( *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -1909,9 +1913,9 @@ public void setSupportedIdentityProviders( * @param supportedIdentityProviders

                        * A list of provider names for the IdPs that this client * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, + * and the names of your own SAML and OIDC providers. *

                        * @return A reference to this updated object so that method calls can be * chained together. @@ -1931,8 +1935,9 @@ public UserPoolClientType withSupportedIdentityProviders(String... supportedIden *

                        * A list of provider names for the IdPs that this client supports. The * following are supported: COGNITO, Facebook, - * Google LoginWithAmazon, and the names of your - * own SAML and OIDC providers. + * Google, SignInWithApple, + * LoginWithAmazon, and the names of your own SAML and OIDC + * providers. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -1941,9 +1946,9 @@ public UserPoolClientType withSupportedIdentityProviders(String... supportedIden * @param supportedIdentityProviders

                        * A list of provider names for the IdPs that this client * supports. The following are supported: COGNITO, - * Facebook, Google - * LoginWithAmazon, and the names of your own SAML - * and OIDC providers. + * Facebook, Google, + * SignInWithApple, LoginWithAmazon, + * and the names of your own SAML and OIDC providers. *

                        * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolType.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolType.java index 14c3a4fa01..eb4e0bf858 100644 --- a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolType.java +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/UserPoolType.java @@ -173,7 +173,7 @@ public class UserPoolType implements Serializable { * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        */ private UserAttributeUpdateSettingsType userAttributeUpdateSettings; @@ -210,8 +210,15 @@ public class UserPoolType implements Serializable { /** *

                        - * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. + *

                        + *                         */ private DeviceConfigurationType deviceConfiguration; @@ -1369,7 +1376,7 @@ public UserPoolType withSmsAuthenticationMessage(String smsAuthenticationMessage * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        * * @return

                        @@ -1380,7 +1387,7 @@ public UserPoolType withSmsAuthenticationMessage(String smsAuthenticationMessage * to the value of your users' email address and phone number * attributes. For more information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        */ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { @@ -1395,7 +1402,7 @@ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        * * @param userAttributeUpdateSettings

                        @@ -1406,8 +1413,7 @@ public UserAttributeUpdateSettingsType getUserAttributeUpdateSettings() { * changes to the value of your users' email address and phone * number attributes. For more information, see Verifying updates to to email addresses and phone - * numbers. + * > Verifying updates to email addresses and phone numbers. *

                        */ public void setUserAttributeUpdateSettings( @@ -1423,7 +1429,7 @@ public void setUserAttributeUpdateSettings( * value of your users' email address and phone number attributes. For more * information, see Verifying updates to to email addresses and phone numbers. + * > Verifying updates to email addresses and phone numbers. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -1437,8 +1443,7 @@ public void setUserAttributeUpdateSettings( * changes to the value of your users' email address and phone * number attributes. For more information, see Verifying updates to to email addresses and phone - * numbers. + * > Verifying updates to email addresses and phone numbers. *

                        * @return A reference to this updated object so that method calls can be * chained together. @@ -1753,12 +1758,28 @@ public UserPoolType withMfaConfiguration(UserPoolMfaType mfaConfiguration) { /** *

                        - * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. + *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. *

                        + *                         * * @return

                        - * The device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering in + * your user pool. *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration + * field, you activate the Amazon Cognito device-remembering + * feature. + *

                        + *                         */ public DeviceConfigurationType getDeviceConfiguration() { return deviceConfiguration; @@ -1766,12 +1787,28 @@ public DeviceConfigurationType getDeviceConfiguration() { /** *

                        - * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. + *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. *

                        + *                         * * @param deviceConfiguration

                        - * The device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering + * in your user pool. + *

                        + * + *

                        + * When you provide a value for any + * DeviceConfiguration field, you activate the + * Amazon Cognito device-remembering feature. *

                        + *                         */ public void setDeviceConfiguration(DeviceConfigurationType deviceConfiguration) { this.deviceConfiguration = deviceConfiguration; @@ -1779,15 +1816,31 @@ public void setDeviceConfiguration(DeviceConfigurationType deviceConfiguration) /** *

                        - * The device configuration. + * The device-remembering configuration for a user pool. A null value + * indicates that you have deactivated device remembering in your user pool. *

                        + * + *

                        + * When you provide a value for any DeviceConfiguration field, + * you activate the Amazon Cognito device-remembering feature. + *

                        + *                         *

                        * Returns a reference to this object so that method calls can be chained * together. * * @param deviceConfiguration

                        - * The device configuration. + * The device-remembering configuration for a user pool. A null + * value indicates that you have deactivated device remembering + * in your user pool. + *

                        + * + *

                        + * When you provide a value for any + * DeviceConfiguration field, you activate the + * Amazon Cognito device-remembering feature. *

                        + *                         * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/transform/ForbiddenExceptionUnmarshaller.java b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/transform/ForbiddenExceptionUnmarshaller.java new file mode 100644 index 0000000000..813da7498f --- /dev/null +++ b/aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/services/cognitoidentityprovider/model/transform/ForbiddenExceptionUnmarshaller.java @@ -0,0 +1,42 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.cognitoidentityprovider.model.transform; + +import com.amazonaws.AmazonServiceException; +import com.amazonaws.http.JsonErrorResponseHandler.JsonErrorResponse; +import com.amazonaws.transform.JsonErrorUnmarshaller; +import com.amazonaws.services.cognitoidentityprovider.model.ForbiddenException; + +public class ForbiddenExceptionUnmarshaller extends JsonErrorUnmarshaller { + + public ForbiddenExceptionUnmarshaller() { + super(ForbiddenException.class); + } + + @Override + public boolean match(JsonErrorResponse error) throws Exception { + return error.getErrorCode().equals("ForbiddenException"); + } + + @Override + public AmazonServiceException unmarshall(JsonErrorResponse error) throws Exception { + + ForbiddenException e = (ForbiddenException) super.unmarshall(error); + e.setErrorCode("ForbiddenException"); + + return e; + } +} From 5e158f0f74998c226ea3e5022ab5b3185aaed4da Mon Sep 17 00:00:00 2001 From: AWS Mobile SDK Bot <46607340+awsmobilesdk@users.noreply.github.com> Date: Tue, 9 Aug 2022 07:38:25 -0700 Subject: [PATCH 07/14] feat(aws-android-sdk-polly): update models to latest (#2959) Co-authored-by: Erica Eaton <67125657+eeatonaws@users.noreply.github.com> --- .../polly/model/StartSpeechSynthesisTaskRequest.java | 12 ++++++------ .../services/polly/model/SynthesisTask.java | 12 ++++++------ .../polly/model/SynthesizeSpeechRequest.java | 12 ++++++------ .../com/amazonaws/services/polly/model/Voice.java | 12 ++++++------ .../com/amazonaws/services/polly/model/VoiceId.java | 4 +++- 5 files changed, 27 insertions(+), 25 deletions(-) diff --git a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/StartSpeechSynthesisTaskRequest.java b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/StartSpeechSynthesisTaskRequest.java index 241f638fba..65af133013 100644 --- a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/StartSpeechSynthesisTaskRequest.java +++ b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/StartSpeechSynthesisTaskRequest.java @@ -179,7 +179,7 @@ public class StartSpeechSynthesisTaskRequest extends AmazonWebServiceRequest imp * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal */ private String voiceId; @@ -1270,7 +1270,7 @@ public StartSpeechSynthesisTaskRequest withTextType(TextType textType) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @return

                        * Voice ID to use for the synthesis. @@ -1294,7 +1294,7 @@ public String getVoiceId() { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. @@ -1321,7 +1321,7 @@ public void setVoiceId(String voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. @@ -1348,7 +1348,7 @@ public StartSpeechSynthesisTaskRequest withVoiceId(String voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. @@ -1375,7 +1375,7 @@ public void setVoiceId(VoiceId voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. diff --git a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesisTask.java b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesisTask.java index d56e0b9f8f..2c7e3832e5 100644 --- a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesisTask.java +++ b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesisTask.java @@ -164,7 +164,7 @@ public class SynthesisTask implements Serializable { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal */ private String voiceId; @@ -1223,7 +1223,7 @@ public SynthesisTask withTextType(TextType textType) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @return

                        * Voice ID to use for the synthesis. @@ -1247,7 +1247,7 @@ public String getVoiceId() { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. @@ -1274,7 +1274,7 @@ public void setVoiceId(String voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. @@ -1301,7 +1301,7 @@ public SynthesisTask withVoiceId(String voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. @@ -1328,7 +1328,7 @@ public void setVoiceId(VoiceId voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. diff --git a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesizeSpeechRequest.java b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesizeSpeechRequest.java index 7b0890c5a9..52549d76e7 100644 --- a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesizeSpeechRequest.java +++ b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/SynthesizeSpeechRequest.java @@ -184,7 +184,7 @@ public class SynthesizeSpeechRequest extends AmazonWebServiceRequest implements * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal */ private String voiceId; @@ -1494,7 +1494,7 @@ public SynthesizeSpeechRequest withTextType(TextType textType) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @return

                        * Voice ID to use for the synthesis. You can get a list of @@ -1524,7 +1524,7 @@ public String getVoiceId() { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. You can get a list of @@ -1557,7 +1557,7 @@ public void setVoiceId(String voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. You can get a list of @@ -1590,7 +1590,7 @@ public SynthesizeSpeechRequest withVoiceId(String voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. You can get a list of @@ -1623,7 +1623,7 @@ public void setVoiceId(VoiceId voiceId) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param voiceId

                        * Voice ID to use for the synthesis. You can get a list of diff --git a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/Voice.java b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/Voice.java index cc734bc186..eb88cfac35 100644 --- a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/Voice.java +++ b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/Voice.java @@ -47,7 +47,7 @@ public class Voice implements Serializable { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal */ private String id; @@ -212,7 +212,7 @@ public Voice withGender(Gender gender) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @return

                        * Amazon Polly assigned voice ID. This is the ID that you specify @@ -238,7 +238,7 @@ public String getId() { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param id

                        * Amazon Polly assigned voice ID. This is the ID that you @@ -268,7 +268,7 @@ public void setId(String id) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param id

                        * Amazon Polly assigned voice ID. This is the ID that you @@ -298,7 +298,7 @@ public Voice withId(String id) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param id

                        * Amazon Polly assigned voice ID. This is the ID that you @@ -328,7 +328,7 @@ public void setId(VoiceId id) { * Lucia, Lupe, Mads, Maja, Marlene, Mathieu, Matthew, Maxim, Mia, Miguel, * Mizuki, Naja, Nicole, Olivia, Penelope, Raveena, Ricardo, Ruben, Russell, * Salli, Seoyeon, Takumi, Tatyana, Vicki, Vitoria, Zeina, Zhiyu, Aria, - * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro + * Ayanda, Arlet, Hannah, Arthur, Daniel, Liam, Pedro, Kajal * * @param id

                        * Amazon Polly assigned voice ID. This is the ID that you diff --git a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/VoiceId.java b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/VoiceId.java index 7d4bb795a9..5ced44b7ee 100644 --- a/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/VoiceId.java +++ b/aws-android-sdk-polly/src/main/java/com/amazonaws/services/polly/model/VoiceId.java @@ -93,7 +93,8 @@ public enum VoiceId { Arthur("Arthur"), Daniel("Daniel"), Liam("Liam"), - Pedro("Pedro"); + Pedro("Pedro"), + Kajal("Kajal"); private String value; @@ -180,6 +181,7 @@ public String toString() { enumMap.put("Daniel", Daniel); enumMap.put("Liam", Liam); enumMap.put("Pedro", Pedro); + enumMap.put("Kajal", Kajal); } /** From 5163ccd84d696f38cdcb058c91fd79bec7f0ae88 Mon Sep 17 00:00:00 2001 From: AWS Mobile SDK Bot <46607340+awsmobilesdk@users.noreply.github.com> Date: Tue, 9 Aug 2022 07:51:25 -0700 Subject: [PATCH 08/14] feat(aws-android-sdk-rekognition): update models to latest (#2957) Co-authored-by: Erica Eaton <67125657+eeatonaws@users.noreply.github.com> --- .../rekognition/AmazonRekognition.java | 4 + .../rekognition/AmazonRekognitionClient.java | 4 + .../model/CreateStreamProcessorRequest.java | 63 +++--- .../model/ProjectVersionDescription.java | 89 +++++++- .../rekognition/model/RegionOfInterest.java | 2 +- .../model/StartProjectVersionRequest.java | 192 +++++++++++++++--- ...ojectVersionDescriptionJsonMarshaller.java | 5 + ...ectVersionDescriptionJsonUnmarshaller.java | 4 + .../StartProjectVersionRequestMarshaller.java | 5 + 9 files changed, 314 insertions(+), 54 deletions(-) diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognition.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognition.java index 54962a51a2..b72c5a842a 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognition.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognition.java @@ -3314,6 +3314,10 @@ StartPersonTrackingResult startPersonTracking( *

                        * *

                        + * For more information, see Running a trained Amazon Rekognition Custom + * Labels model in the Amazon Rekognition Custom Labels Guide. + *

                        + *

                        * This operation requires permissions to perform the * rekognition:StartProjectVersion action. *

                        diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognitionClient.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognitionClient.java index f0de82c692..6e2f62dbdd 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognitionClient.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/AmazonRekognitionClient.java @@ -4899,6 +4899,10 @@ public StartPersonTrackingResult startPersonTracking( *

                        * *

                        + * For more information, see Running a trained Amazon Rekognition Custom + * Labels model in the Amazon Rekognition Custom Labels Guide. + *

                        + *

                        * This operation requires permissions to perform the * rekognition:StartProjectVersion action. *

                        diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/CreateStreamProcessorRequest.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/CreateStreamProcessorRequest.java index 9e834aa455..d85837ae55 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/CreateStreamProcessorRequest.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/CreateStreamProcessorRequest.java @@ -183,9 +183,10 @@ public class CreateStreamProcessorRequest extends AmazonWebServiceRequest implem /** *

                        * Specifies locations in the frames where Amazon Rekognition checks for - * objects or people. You can specify up to 10 regions of interest. This is - * an optional parameter for label detection stream processors and should - * not be used to create a face search stream processor. + * objects or people. You can specify up to 10 regions of interest, and each + * region has either a polygon or a bounding box. This is an optional + * parameter for label detection stream processors and should not be used to + * create a face search stream processor. *

                        */ private java.util.List regionsOfInterest; @@ -910,17 +911,19 @@ public CreateStreamProcessorRequest withKmsKeyId(String kmsKeyId) { /** *

                        * Specifies locations in the frames where Amazon Rekognition checks for - * objects or people. You can specify up to 10 regions of interest. This is - * an optional parameter for label detection stream processors and should - * not be used to create a face search stream processor. + * objects or people. You can specify up to 10 regions of interest, and each + * region has either a polygon or a bounding box. This is an optional + * parameter for label detection stream processors and should not be used to + * create a face search stream processor. *

                        * * @return

                        * Specifies locations in the frames where Amazon Rekognition checks * for objects or people. You can specify up to 10 regions of - * interest. This is an optional parameter for label detection - * stream processors and should not be used to create a face search - * stream processor. + * interest, and each region has either a polygon or a bounding box. + * This is an optional parameter for label detection stream + * processors and should not be used to create a face search stream + * processor. *

                        */ public java.util.List getRegionsOfInterest() { @@ -930,17 +933,19 @@ public java.util.List getRegionsOfInterest() { /** *

                        * Specifies locations in the frames where Amazon Rekognition checks for - * objects or people. You can specify up to 10 regions of interest. This is - * an optional parameter for label detection stream processors and should - * not be used to create a face search stream processor. + * objects or people. You can specify up to 10 regions of interest, and each + * region has either a polygon or a bounding box. This is an optional + * parameter for label detection stream processors and should not be used to + * create a face search stream processor. *

                        * * @param regionsOfInterest

                        * Specifies locations in the frames where Amazon Rekognition * checks for objects or people. You can specify up to 10 regions - * of interest. This is an optional parameter for label detection - * stream processors and should not be used to create a face - * search stream processor. + * of interest, and each region has either a polygon or a + * bounding box. This is an optional parameter for label + * detection stream processors and should not be used to create a + * face search stream processor. *

                        */ public void setRegionsOfInterest(java.util.Collection regionsOfInterest) { @@ -955,9 +960,10 @@ public void setRegionsOfInterest(java.util.Collection regionsO /** *

                        * Specifies locations in the frames where Amazon Rekognition checks for - * objects or people. You can specify up to 10 regions of interest. This is - * an optional parameter for label detection stream processors and should - * not be used to create a face search stream processor. + * objects or people. You can specify up to 10 regions of interest, and each + * region has either a polygon or a bounding box. This is an optional + * parameter for label detection stream processors and should not be used to + * create a face search stream processor. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -966,9 +972,10 @@ public void setRegionsOfInterest(java.util.Collection regionsO * @param regionsOfInterest

                        * Specifies locations in the frames where Amazon Rekognition * checks for objects or people. You can specify up to 10 regions - * of interest. This is an optional parameter for label detection - * stream processors and should not be used to create a face - * search stream processor. + * of interest, and each region has either a polygon or a + * bounding box. This is an optional parameter for label + * detection stream processors and should not be used to create a + * face search stream processor. *

                        * @return A reference to this updated object so that method calls can be * chained together. @@ -987,9 +994,10 @@ public CreateStreamProcessorRequest withRegionsOfInterest(RegionOfInterest... re /** *

                        * Specifies locations in the frames where Amazon Rekognition checks for - * objects or people. You can specify up to 10 regions of interest. This is - * an optional parameter for label detection stream processors and should - * not be used to create a face search stream processor. + * objects or people. You can specify up to 10 regions of interest, and each + * region has either a polygon or a bounding box. This is an optional + * parameter for label detection stream processors and should not be used to + * create a face search stream processor. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -998,9 +1006,10 @@ public CreateStreamProcessorRequest withRegionsOfInterest(RegionOfInterest... re * @param regionsOfInterest

                        * Specifies locations in the frames where Amazon Rekognition * checks for objects or people. You can specify up to 10 regions - * of interest. This is an optional parameter for label detection - * stream processors and should not be used to create a face - * search stream processor. + * of interest, and each region has either a polygon or a + * bounding box. This is an optional parameter for label + * detection stream processors and should not be used to create a + * face search stream processor. *

                        * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/ProjectVersionDescription.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/ProjectVersionDescription.java index 8d05057175..5888fac90e 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/ProjectVersionDescription.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/ProjectVersionDescription.java @@ -140,6 +140,18 @@ public class ProjectVersionDescription implements Serializable { */ private String kmsKeyId; + /** + *

                        + * The maximum number of inference units Amazon Rekognition Custom Labels + * uses to auto-scale the model. For more information, see + * StartProjectVersion. + *

                        + *

                        + * Constraints:
                        + * Range: 1 -
                        + */ + private Integer maxInferenceUnits; + /** *

                        * The Amazon Resource Name (ARN) of the model version. @@ -870,6 +882,72 @@ public ProjectVersionDescription withKmsKeyId(String kmsKeyId) { return this; } + /** + *

                        + * The maximum number of inference units Amazon Rekognition Custom Labels + * uses to auto-scale the model. For more information, see + * StartProjectVersion. + *

                        + *

                        + * Constraints:
                        + * Range: 1 -
                        + * + * @return

                        + * The maximum number of inference units Amazon Rekognition Custom + * Labels uses to auto-scale the model. For more information, see + * StartProjectVersion. + *

                        + */ + public Integer getMaxInferenceUnits() { + return maxInferenceUnits; + } + + /** + *

                        + * The maximum number of inference units Amazon Rekognition Custom Labels + * uses to auto-scale the model. For more information, see + * StartProjectVersion. + *

                        + *

                        + * Constraints:
                        + * Range: 1 -
                        + * + * @param maxInferenceUnits

                        + * The maximum number of inference units Amazon Rekognition + * Custom Labels uses to auto-scale the model. For more + * information, see StartProjectVersion. + *

                        + */ + public void setMaxInferenceUnits(Integer maxInferenceUnits) { + this.maxInferenceUnits = maxInferenceUnits; + } + + /** + *

                        + * The maximum number of inference units Amazon Rekognition Custom Labels + * uses to auto-scale the model. For more information, see + * StartProjectVersion. + *

                        + *

                        + * Returns a reference to this object so that method calls can be chained + * together. + *

                        + * Constraints:
                        + * Range: 1 -
                        + * + * @param maxInferenceUnits

                        + * The maximum number of inference units Amazon Rekognition + * Custom Labels uses to auto-scale the model. For more + * information, see StartProjectVersion. + *

                        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public ProjectVersionDescription withMaxInferenceUnits(Integer maxInferenceUnits) { + this.maxInferenceUnits = maxInferenceUnits; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -906,7 +984,9 @@ public String toString() { if (getManifestSummary() != null) sb.append("ManifestSummary: " + getManifestSummary() + ","); if (getKmsKeyId() != null) - sb.append("KmsKeyId: " + getKmsKeyId()); + sb.append("KmsKeyId: " + getKmsKeyId() + ","); + if (getMaxInferenceUnits() != null) + sb.append("MaxInferenceUnits: " + getMaxInferenceUnits()); sb.append("}"); return sb.toString(); } @@ -942,6 +1022,8 @@ public int hashCode() { hashCode = prime * hashCode + ((getManifestSummary() == null) ? 0 : getManifestSummary().hashCode()); hashCode = prime * hashCode + ((getKmsKeyId() == null) ? 0 : getKmsKeyId().hashCode()); + hashCode = prime * hashCode + + ((getMaxInferenceUnits() == null) ? 0 : getMaxInferenceUnits().hashCode()); return hashCode; } @@ -1021,6 +1103,11 @@ public boolean equals(Object obj) { return false; if (other.getKmsKeyId() != null && other.getKmsKeyId().equals(this.getKmsKeyId()) == false) return false; + if (other.getMaxInferenceUnits() == null ^ this.getMaxInferenceUnits() == null) + return false; + if (other.getMaxInferenceUnits() != null + && other.getMaxInferenceUnits().equals(this.getMaxInferenceUnits()) == false) + return false; return true; } } diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/RegionOfInterest.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/RegionOfInterest.java index 08841dbf1d..75bc66c785 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/RegionOfInterest.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/RegionOfInterest.java @@ -21,7 +21,7 @@ *

                        * Specifies a location within the frame that Rekognition checks for objects of * interest such as text, labels, or faces. It uses a BoundingBox - * or object or Polygon to set a region of the screen. + * or Polygon to set a region of the screen. *

                        *

                        * A word, face, or label is included in the region if it is more than half in diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/StartProjectVersionRequest.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/StartProjectVersionRequest.java index 9a4cb26f66..b9aa3b65ba 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/StartProjectVersionRequest.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/StartProjectVersionRequest.java @@ -36,6 +36,10 @@ *

                        * *

                        + * For more information, see Running a trained Amazon Rekognition Custom + * Labels model in the Amazon Rekognition Custom Labels Guide. + *

                        + *

                        * This operation requires permissions to perform the * rekognition:StartProjectVersion action. *

                        @@ -58,9 +62,16 @@ public class StartProjectVersionRequest extends AmazonWebServiceRequest implemen /** *

                        * The minimum number of inference units to use. A single inference unit - * represents 1 hour of processing and can support up to 5 Transaction Pers - * Second (TPS). Use a higher number to increase the TPS throughput of your - * model. You are charged for the number of inference units that you use. + * represents 1 hour of processing. + *

                        + *

                        + * For information about the number of transactions per second (TPS) that an + * inference unit can support, see Running a trained Amazon Rekognition + * Custom Labels model in the Amazon Rekognition Custom Labels Guide. + *

                        + *

                        + * Use a higher number to increase the TPS throughput of your model. You are + * charged for the number of inference units that you use. *

                        *

                        * Constraints:
                        @@ -68,6 +79,18 @@ public class StartProjectVersionRequest extends AmazonWebServiceRequest implemen */ private Integer minInferenceUnits; + /** + *

                        + * The maximum number of inference units to use for auto-scaling the model. + * If you don't specify a value, Amazon Rekognition Custom Labels doesn't + * auto-scale the model. + *

                        + *

                        + * Constraints:
                        + * Range: 1 -
                        + */ + private Integer maxInferenceUnits; + /** *

                        * The Amazon Resource Name(ARN) of the model version that you want to @@ -140,9 +163,16 @@ public StartProjectVersionRequest withProjectVersionArn(String projectVersionArn /** *

                        * The minimum number of inference units to use. A single inference unit - * represents 1 hour of processing and can support up to 5 Transaction Pers - * Second (TPS). Use a higher number to increase the TPS throughput of your - * model. You are charged for the number of inference units that you use. + * represents 1 hour of processing. + *

                        + *

                        + * For information about the number of transactions per second (TPS) that an + * inference unit can support, see Running a trained Amazon Rekognition + * Custom Labels model in the Amazon Rekognition Custom Labels Guide. + *

                        + *

                        + * Use a higher number to increase the TPS throughput of your model. You are + * charged for the number of inference units that you use. *

                        *

                        * Constraints:
                        @@ -150,10 +180,17 @@ public StartProjectVersionRequest withProjectVersionArn(String projectVersionArn * * @return

                        * The minimum number of inference units to use. A single inference - * unit represents 1 hour of processing and can support up to 5 - * Transaction Pers Second (TPS). Use a higher number to increase - * the TPS throughput of your model. You are charged for the number - * of inference units that you use. + * unit represents 1 hour of processing. + *

                        + *

                        + * For information about the number of transactions per second (TPS) + * that an inference unit can support, see Running a trained + * Amazon Rekognition Custom Labels model in the Amazon + * Rekognition Custom Labels Guide. + *

                        + *

                        + * Use a higher number to increase the TPS throughput of your model. + * You are charged for the number of inference units that you use. *

                        */ public Integer getMinInferenceUnits() { @@ -163,9 +200,16 @@ public Integer getMinInferenceUnits() { /** *

                        * The minimum number of inference units to use. A single inference unit - * represents 1 hour of processing and can support up to 5 Transaction Pers - * Second (TPS). Use a higher number to increase the TPS throughput of your - * model. You are charged for the number of inference units that you use. + * represents 1 hour of processing. + *

                        + *

                        + * For information about the number of transactions per second (TPS) that an + * inference unit can support, see Running a trained Amazon Rekognition + * Custom Labels model in the Amazon Rekognition Custom Labels Guide. + *

                        + *

                        + * Use a higher number to increase the TPS throughput of your model. You are + * charged for the number of inference units that you use. *

                        *

                        * Constraints:
                        @@ -173,10 +217,18 @@ public Integer getMinInferenceUnits() { * * @param minInferenceUnits

                        * The minimum number of inference units to use. A single - * inference unit represents 1 hour of processing and can support - * up to 5 Transaction Pers Second (TPS). Use a higher number to - * increase the TPS throughput of your model. You are charged for - * the number of inference units that you use. + * inference unit represents 1 hour of processing. + *

                        + *

                        + * For information about the number of transactions per second + * (TPS) that an inference unit can support, see Running a + * trained Amazon Rekognition Custom Labels model in the + * Amazon Rekognition Custom Labels Guide. + *

                        + *

                        + * Use a higher number to increase the TPS throughput of your + * model. You are charged for the number of inference units that + * you use. *

                        */ public void setMinInferenceUnits(Integer minInferenceUnits) { @@ -186,9 +238,16 @@ public void setMinInferenceUnits(Integer minInferenceUnits) { /** *

                        * The minimum number of inference units to use. A single inference unit - * represents 1 hour of processing and can support up to 5 Transaction Pers - * Second (TPS). Use a higher number to increase the TPS throughput of your - * model. You are charged for the number of inference units that you use. + * represents 1 hour of processing. + *

                        + *

                        + * For information about the number of transactions per second (TPS) that an + * inference unit can support, see Running a trained Amazon Rekognition + * Custom Labels model in the Amazon Rekognition Custom Labels Guide. + *

                        + *

                        + * Use a higher number to increase the TPS throughput of your model. You are + * charged for the number of inference units that you use. *

                        *

                        * Returns a reference to this object so that method calls can be chained @@ -199,10 +258,18 @@ public void setMinInferenceUnits(Integer minInferenceUnits) { * * @param minInferenceUnits

                        * The minimum number of inference units to use. A single - * inference unit represents 1 hour of processing and can support - * up to 5 Transaction Pers Second (TPS). Use a higher number to - * increase the TPS throughput of your model. You are charged for - * the number of inference units that you use. + * inference unit represents 1 hour of processing. + *

                        + *

                        + * For information about the number of transactions per second + * (TPS) that an inference unit can support, see Running a + * trained Amazon Rekognition Custom Labels model in the + * Amazon Rekognition Custom Labels Guide. + *

                        + *

                        + * Use a higher number to increase the TPS throughput of your + * model. You are charged for the number of inference units that + * you use. *

                        * @return A reference to this updated object so that method calls can be * chained together. @@ -212,6 +279,72 @@ public StartProjectVersionRequest withMinInferenceUnits(Integer minInferenceUnit return this; } + /** + *

                        + * The maximum number of inference units to use for auto-scaling the model. + * If you don't specify a value, Amazon Rekognition Custom Labels doesn't + * auto-scale the model. + *

                        + *

                        + * Constraints:
                        + * Range: 1 -
                        + * + * @return

                        + * The maximum number of inference units to use for auto-scaling the + * model. If you don't specify a value, Amazon Rekognition Custom + * Labels doesn't auto-scale the model. + *

                        + */ + public Integer getMaxInferenceUnits() { + return maxInferenceUnits; + } + + /** + *

                        + * The maximum number of inference units to use for auto-scaling the model. + * If you don't specify a value, Amazon Rekognition Custom Labels doesn't + * auto-scale the model. + *

                        + *

                        + * Constraints:
                        + * Range: 1 -
                        + * + * @param maxInferenceUnits

                        + * The maximum number of inference units to use for auto-scaling + * the model. If you don't specify a value, Amazon Rekognition + * Custom Labels doesn't auto-scale the model. + *

                        + */ + public void setMaxInferenceUnits(Integer maxInferenceUnits) { + this.maxInferenceUnits = maxInferenceUnits; + } + + /** + *

                        + * The maximum number of inference units to use for auto-scaling the model. + * If you don't specify a value, Amazon Rekognition Custom Labels doesn't + * auto-scale the model. + *

                        + *

                        + * Returns a reference to this object so that method calls can be chained + * together. + *

                        + * Constraints:
                        + * Range: 1 -
                        + * + * @param maxInferenceUnits

                        + * The maximum number of inference units to use for auto-scaling + * the model. If you don't specify a value, Amazon Rekognition + * Custom Labels doesn't auto-scale the model. + *

                        + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public StartProjectVersionRequest withMaxInferenceUnits(Integer maxInferenceUnits) { + this.maxInferenceUnits = maxInferenceUnits; + return this; + } + /** * Returns a string representation of this object; useful for testing and * debugging. @@ -226,7 +359,9 @@ public String toString() { if (getProjectVersionArn() != null) sb.append("ProjectVersionArn: " + getProjectVersionArn() + ","); if (getMinInferenceUnits() != null) - sb.append("MinInferenceUnits: " + getMinInferenceUnits()); + sb.append("MinInferenceUnits: " + getMinInferenceUnits() + ","); + if (getMaxInferenceUnits() != null) + sb.append("MaxInferenceUnits: " + getMaxInferenceUnits()); sb.append("}"); return sb.toString(); } @@ -240,6 +375,8 @@ public int hashCode() { + ((getProjectVersionArn() == null) ? 0 : getProjectVersionArn().hashCode()); hashCode = prime * hashCode + ((getMinInferenceUnits() == null) ? 0 : getMinInferenceUnits().hashCode()); + hashCode = prime * hashCode + + ((getMaxInferenceUnits() == null) ? 0 : getMaxInferenceUnits().hashCode()); return hashCode; } @@ -264,6 +401,11 @@ public boolean equals(Object obj) { if (other.getMinInferenceUnits() != null && other.getMinInferenceUnits().equals(this.getMinInferenceUnits()) == false) return false; + if (other.getMaxInferenceUnits() == null ^ this.getMaxInferenceUnits() == null) + return false; + if (other.getMaxInferenceUnits() != null + && other.getMaxInferenceUnits().equals(this.getMaxInferenceUnits()) == false) + return false; return true; } } diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonMarshaller.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonMarshaller.java index 6bc098119e..5660647932 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonMarshaller.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonMarshaller.java @@ -95,6 +95,11 @@ public void marshall(ProjectVersionDescription projectVersionDescription, jsonWriter.name("KmsKeyId"); jsonWriter.value(kmsKeyId); } + if (projectVersionDescription.getMaxInferenceUnits() != null) { + Integer maxInferenceUnits = projectVersionDescription.getMaxInferenceUnits(); + jsonWriter.name("MaxInferenceUnits"); + jsonWriter.value(maxInferenceUnits); + } jsonWriter.endObject(); } diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonUnmarshaller.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonUnmarshaller.java index 1793b1cb79..737aa1377e 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonUnmarshaller.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/ProjectVersionDescriptionJsonUnmarshaller.java @@ -83,6 +83,10 @@ public ProjectVersionDescription unmarshall(JsonUnmarshallerContext context) thr } else if (name.equals("KmsKeyId")) { projectVersionDescription.setKmsKeyId(StringJsonUnmarshaller.getInstance() .unmarshall(context)); + } else if (name.equals("MaxInferenceUnits")) { + projectVersionDescription.setMaxInferenceUnits(IntegerJsonUnmarshaller + .getInstance() + .unmarshall(context)); } else { reader.skipValue(); } diff --git a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/StartProjectVersionRequestMarshaller.java b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/StartProjectVersionRequestMarshaller.java index e84876a2a6..dc30a3410b 100644 --- a/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/StartProjectVersionRequestMarshaller.java +++ b/aws-android-sdk-rekognition/src/main/java/com/amazonaws/services/rekognition/model/transform/StartProjectVersionRequestMarshaller.java @@ -73,6 +73,11 @@ public Request marshall( jsonWriter.name("MinInferenceUnits"); jsonWriter.value(minInferenceUnits); } + if (startProjectVersionRequest.getMaxInferenceUnits() != null) { + Integer maxInferenceUnits = startProjectVersionRequest.getMaxInferenceUnits(); + jsonWriter.name("MaxInferenceUnits"); + jsonWriter.value(maxInferenceUnits); + } jsonWriter.endObject(); jsonWriter.close(); From 7b25e68f876c80e60f9b54f318e84dc2e61f1b42 Mon Sep 17 00:00:00 2001 From: AWS Mobile SDK Bot <46607340+awsmobilesdk@users.noreply.github.com> Date: Tue, 9 Aug 2022 08:09:21 -0700 Subject: [PATCH 09/14] feat(aws-android-sdk-transcribe): update models to latest (#2953) Co-authored-by: Erica Eaton <67125657+eeatonaws@users.noreply.github.com> --- .../transcribe/model/CallAnalyticsJob.java | 54 +++++++++---------- .../model/CallAnalyticsJobSummary.java | 54 +++++++++---------- .../model/CreateMedicalVocabularyRequest.java | 54 +++++++++---------- .../model/CreateMedicalVocabularyResult.java | 54 +++++++++---------- .../model/CreateVocabularyFilterRequest.java | 54 +++++++++---------- .../model/CreateVocabularyFilterResult.java | 54 +++++++++---------- .../model/CreateVocabularyRequest.java | 54 +++++++++---------- .../model/CreateVocabularyResult.java | 54 +++++++++---------- .../model/GetMedicalVocabularyResult.java | 54 +++++++++---------- .../model/GetVocabularyFilterResult.java | 54 +++++++++---------- .../transcribe/model/GetVocabularyResult.java | 54 +++++++++---------- .../transcribe/model/LanguageCode.java | 6 --- .../transcribe/model/LanguageCodeItem.java | 54 +++++++++---------- .../model/MedicalTranscriptionJob.java | 54 +++++++++---------- .../model/MedicalTranscriptionJobSummary.java | 54 +++++++++---------- .../StartMedicalTranscriptionJobRequest.java | 54 +++++++++---------- .../model/StartTranscriptionJobRequest.java | 54 +++++++++---------- .../transcribe/model/TranscriptionJob.java | 54 +++++++++---------- .../model/TranscriptionJobSummary.java | 54 +++++++++---------- .../model/UpdateMedicalVocabularyRequest.java | 54 +++++++++---------- .../model/UpdateMedicalVocabularyResult.java | 54 +++++++++---------- .../model/UpdateVocabularyFilterResult.java | 54 +++++++++---------- .../model/UpdateVocabularyRequest.java | 54 +++++++++---------- .../model/UpdateVocabularyResult.java | 54 +++++++++---------- .../model/VocabularyFilterInfo.java | 54 +++++++++---------- .../transcribe/model/VocabularyInfo.java | 54 +++++++++---------- 26 files changed, 600 insertions(+), 756 deletions(-) diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJob.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJob.java index 6bbad68684..f41cb85dbe 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJob.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJob.java @@ -87,11 +87,10 @@ public class CallAnalyticsJob implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -571,11 +570,10 @@ public CallAnalyticsJob withCallAnalyticsJobStatus(CallAnalyticsJobStatus callAn *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code used to create your Call Analytics job. For a @@ -614,11 +612,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics job. For @@ -661,11 +658,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics job. For @@ -708,11 +704,10 @@ public CallAnalyticsJob withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics job. For @@ -755,11 +750,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics job. For diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJobSummary.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJobSummary.java index 6e60c0b8ae..85083c1852 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJobSummary.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CallAnalyticsJobSummary.java @@ -80,11 +80,10 @@ public class CallAnalyticsJobSummary implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -446,11 +445,10 @@ public CallAnalyticsJobSummary withCompletionTime(java.util.Date completionTime) *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code used to create your Call Analytics @@ -468,11 +466,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics @@ -493,11 +490,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics @@ -518,11 +514,10 @@ public CallAnalyticsJobSummary withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics @@ -543,11 +538,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your Call Analytics diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyRequest.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyRequest.java index c9e5adb9ae..19090c90fd 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyRequest.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyRequest.java @@ -71,11 +71,10 @@ public class CreateMedicalVocabularyRequest extends AmazonWebServiceRequest impl *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -216,11 +215,10 @@ public CreateMedicalVocabularyRequest withVocabularyName(String vocabularyName) *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language of the entries in @@ -241,11 +239,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -269,11 +266,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -297,11 +293,10 @@ public CreateMedicalVocabularyRequest withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -325,11 +320,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyResult.java index 5460c49e74..9f9f999828 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateMedicalVocabularyResult.java @@ -37,11 +37,10 @@ public class CreateMedicalVocabularyResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -146,11 +145,10 @@ public CreateMedicalVocabularyResult withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your medical vocabulary. US @@ -171,11 +169,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -199,11 +196,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -227,11 +223,10 @@ public CreateMedicalVocabularyResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -255,11 +250,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterRequest.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterRequest.java index d33855c6ef..1e3225df6b 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterRequest.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterRequest.java @@ -80,11 +80,10 @@ public class CreateVocabularyFilterRequest extends AmazonWebServiceRequest imple *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -267,11 +266,10 @@ public CreateVocabularyFilterRequest withVocabularyFilterName(String vocabularyF *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language of the entries in @@ -316,11 +314,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -369,11 +366,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -422,11 +418,10 @@ public CreateVocabularyFilterRequest withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -475,11 +470,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterResult.java index 7a5dba05da..d5bc80d4e9 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyFilterResult.java @@ -35,11 +35,10 @@ public class CreateVocabularyFilterResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -119,11 +118,10 @@ public CreateVocabularyFilterResult withVocabularyFilterName(String vocabularyFi *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your vocabulary filter. @@ -140,11 +138,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -164,11 +161,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -188,11 +184,10 @@ public CreateVocabularyFilterResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -212,11 +207,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyRequest.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyRequest.java index 044e6a8104..45c158cd06 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyRequest.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyRequest.java @@ -81,11 +81,10 @@ public class CreateVocabularyRequest extends AmazonWebServiceRequest implements *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -260,11 +259,10 @@ public CreateVocabularyRequest withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language of the entries in @@ -309,11 +307,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -362,11 +359,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -415,11 +411,10 @@ public CreateVocabularyRequest withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -468,11 +463,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyResult.java index 29268f7f45..f33ae1974c 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/CreateVocabularyResult.java @@ -35,11 +35,10 @@ public class CreateVocabularyResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -142,11 +141,10 @@ public CreateVocabularyResult withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your custom vocabulary. @@ -163,11 +161,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -187,11 +184,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -211,11 +207,10 @@ public CreateVocabularyResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -235,11 +230,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetMedicalVocabularyResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetMedicalVocabularyResult.java index 3b22c129a8..ec010393c5 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetMedicalVocabularyResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetMedicalVocabularyResult.java @@ -38,11 +38,10 @@ public class GetMedicalVocabularyResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -166,11 +165,10 @@ public GetMedicalVocabularyResult withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your medical vocabulary. US @@ -191,11 +189,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -219,11 +216,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -247,11 +243,10 @@ public GetMedicalVocabularyResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -275,11 +270,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyFilterResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyFilterResult.java index 306bd3751f..972c22c7ea 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyFilterResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyFilterResult.java @@ -35,11 +35,10 @@ public class GetVocabularyFilterResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -134,11 +133,10 @@ public GetVocabularyFilterResult withVocabularyFilterName(String vocabularyFilte *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your vocabulary filter. @@ -155,11 +153,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -179,11 +176,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -203,11 +199,10 @@ public GetVocabularyFilterResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -227,11 +222,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyResult.java index e51ac64ec4..fbf2f56710 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/GetVocabularyResult.java @@ -35,11 +35,10 @@ public class GetVocabularyResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -157,11 +156,10 @@ public GetVocabularyResult withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your custom vocabulary. @@ -178,11 +176,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -202,11 +199,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -226,11 +222,10 @@ public GetVocabularyResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -250,11 +245,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCode.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCode.java index 82f226f8ab..d529a6bee2 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCode.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCode.java @@ -26,7 +26,6 @@ public enum LanguageCode { AfZA("af-ZA"), ArAE("ar-AE"), ArSA("ar-SA"), - CyGB("cy-GB"), DaDK("da-DK"), DeCH("de-CH"), DeDE("de-DE"), @@ -42,8 +41,6 @@ public enum LanguageCode { FaIR("fa-IR"), FrCA("fr-CA"), FrFR("fr-FR"), - GaIE("ga-IE"), - GdGB("gd-GB"), HeIL("he-IL"), HiIN("hi-IN"), IdID("id-ID"), @@ -81,7 +78,6 @@ public String toString() { enumMap.put("af-ZA", AfZA); enumMap.put("ar-AE", ArAE); enumMap.put("ar-SA", ArSA); - enumMap.put("cy-GB", CyGB); enumMap.put("da-DK", DaDK); enumMap.put("de-CH", DeCH); enumMap.put("de-DE", DeDE); @@ -97,8 +93,6 @@ public String toString() { enumMap.put("fa-IR", FaIR); enumMap.put("fr-CA", FrCA); enumMap.put("fr-FR", FrFR); - enumMap.put("ga-IE", GaIE); - enumMap.put("gd-GB", GdGB); enumMap.put("he-IL", HeIL); enumMap.put("hi-IN", HiIN); enumMap.put("id-ID", IdID); diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCodeItem.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCodeItem.java index fe730686a1..136f4e02b2 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCodeItem.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/LanguageCodeItem.java @@ -32,11 +32,10 @@ public class LanguageCodeItem implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -54,11 +53,10 @@ public class LanguageCodeItem implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * Provides the language code for each language identified in your @@ -76,11 +74,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * Provides the language code for each language identified in @@ -101,11 +98,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * Provides the language code for each language identified in @@ -126,11 +122,10 @@ public LanguageCodeItem withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * Provides the language code for each language identified in @@ -151,11 +146,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * Provides the language code for each language identified in diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJob.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJob.java index 7a1d27061a..b659a8803a 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJob.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJob.java @@ -68,11 +68,10 @@ public class MedicalTranscriptionJob implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -529,11 +528,10 @@ public MedicalTranscriptionJob withTranscriptionJobStatus( *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code used to create your medical transcription job. @@ -554,11 +552,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription @@ -582,11 +579,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription @@ -610,11 +606,10 @@ public MedicalTranscriptionJob withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription @@ -638,11 +633,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJobSummary.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJobSummary.java index 189942e7ad..d2177fe14f 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJobSummary.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/MedicalTranscriptionJobSummary.java @@ -84,11 +84,10 @@ public class MedicalTranscriptionJobSummary implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -519,11 +518,10 @@ public MedicalTranscriptionJobSummary withCompletionTime(java.util.Date completi *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code used to create your medical transcription. US @@ -544,11 +542,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription. @@ -572,11 +569,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription. @@ -600,11 +596,10 @@ public MedicalTranscriptionJobSummary withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription. @@ -628,11 +623,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your medical transcription. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartMedicalTranscriptionJobRequest.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartMedicalTranscriptionJobRequest.java index cb90333900..6408fd6b83 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartMedicalTranscriptionJobRequest.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartMedicalTranscriptionJobRequest.java @@ -119,11 +119,10 @@ public class StartMedicalTranscriptionJobRequest extends AmazonWebServiceRequest *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -538,11 +537,10 @@ public StartMedicalTranscriptionJobRequest withMedicalTranscriptionJobName( *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language spoken in the @@ -566,11 +564,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the @@ -597,11 +594,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the @@ -628,11 +624,10 @@ public StartMedicalTranscriptionJobRequest withLanguageCode(String languageCode) *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the @@ -659,11 +654,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartTranscriptionJobRequest.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartTranscriptionJobRequest.java index 913bff2536..9b90c87e45 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartTranscriptionJobRequest.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/StartTranscriptionJobRequest.java @@ -122,11 +122,10 @@ public class StartTranscriptionJobRequest extends AmazonWebServiceRequest implem * *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -700,11 +699,10 @@ public StartTranscriptionJobRequest withTranscriptionJobName(String transcriptio * *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language spoken in the @@ -773,11 +771,10 @@ public String getLanguageCode() { * *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the @@ -849,11 +846,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the @@ -925,11 +921,10 @@ public StartTranscriptionJobRequest withLanguageCode(String languageCode) { * *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the @@ -1001,11 +996,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language spoken in the diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJob.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJob.java index f12b2f8179..71871dec3b 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJob.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJob.java @@ -81,11 +81,10 @@ public class TranscriptionJob implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -682,11 +681,10 @@ public TranscriptionJob withTranscriptionJobStatus(TranscriptionJobStatus transc *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code used to create your transcription job. For a @@ -724,11 +722,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription job. For a @@ -769,11 +766,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription job. For a @@ -814,11 +810,10 @@ public TranscriptionJob withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription job. For a @@ -859,11 +854,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription job. For a diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJobSummary.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJobSummary.java index 4e2bbcb7b2..e4ab889454 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJobSummary.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/TranscriptionJobSummary.java @@ -80,11 +80,10 @@ public class TranscriptionJobSummary implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -531,11 +530,10 @@ public TranscriptionJobSummary withCompletionTime(java.util.Date completionTime) *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code used to create your transcription. @@ -552,11 +550,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription. @@ -576,11 +573,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription. @@ -600,11 +596,10 @@ public TranscriptionJobSummary withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription. @@ -624,11 +619,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your transcription. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyRequest.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyRequest.java index ec34d5d8ab..da8e2b1b2c 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyRequest.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyRequest.java @@ -47,11 +47,10 @@ public class UpdateMedicalVocabularyRequest extends AmazonWebServiceRequest impl *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -143,11 +142,10 @@ public UpdateMedicalVocabularyRequest withVocabularyName(String vocabularyName) *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language of the entries in @@ -169,11 +167,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -198,11 +195,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -227,11 +223,10 @@ public UpdateMedicalVocabularyRequest withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -256,11 +251,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyResult.java index 092e06ba96..8c00682c36 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateMedicalVocabularyResult.java @@ -37,11 +37,10 @@ public class UpdateMedicalVocabularyResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -136,11 +135,10 @@ public UpdateMedicalVocabularyResult withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your medical vocabulary. US @@ -161,11 +159,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -189,11 +186,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -217,11 +213,10 @@ public UpdateMedicalVocabularyResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US @@ -245,11 +240,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your medical vocabulary. US diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyFilterResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyFilterResult.java index f06f9b5d79..05ccd3ecd4 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyFilterResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyFilterResult.java @@ -35,11 +35,10 @@ public class UpdateVocabularyFilterResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -119,11 +118,10 @@ public UpdateVocabularyFilterResult withVocabularyFilterName(String vocabularyFi *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your vocabulary filter. @@ -140,11 +138,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -164,11 +161,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -188,11 +184,10 @@ public UpdateVocabularyFilterResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. @@ -212,11 +207,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your vocabulary filter. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyRequest.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyRequest.java index d1a3d6300b..5378cae1a8 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyRequest.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyRequest.java @@ -59,11 +59,10 @@ public class UpdateVocabularyRequest extends AmazonWebServiceRequest implements *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -195,11 +194,10 @@ public UpdateVocabularyRequest withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language of the entries in @@ -244,11 +242,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -297,11 +294,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -350,11 +346,10 @@ public UpdateVocabularyRequest withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -403,11 +398,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyResult.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyResult.java index 63fe34c3fe..27f3fb4b0f 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyResult.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/UpdateVocabularyResult.java @@ -35,11 +35,10 @@ public class UpdateVocabularyResult implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -131,11 +130,10 @@ public UpdateVocabularyResult withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code you selected for your custom vocabulary. @@ -152,11 +150,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -176,11 +173,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -200,11 +196,10 @@ public UpdateVocabularyResult withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. @@ -224,11 +219,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code you selected for your custom vocabulary. diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyFilterInfo.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyFilterInfo.java index 1ff0099e72..2f387357ea 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyFilterInfo.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyFilterInfo.java @@ -57,11 +57,10 @@ public class VocabularyFilterInfo implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -167,11 +166,10 @@ public VocabularyFilterInfo withVocabularyFilterName(String vocabularyFilterName *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code that represents the language of the entries in @@ -216,11 +214,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -269,11 +266,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -322,11 +318,10 @@ public VocabularyFilterInfo withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries @@ -375,11 +370,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code that represents the language of the entries diff --git a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyInfo.java b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyInfo.java index 8e2245912e..e46e265669 100644 --- a/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyInfo.java +++ b/aws-android-sdk-transcribe/src/main/java/com/amazonaws/services/transcribe/model/VocabularyInfo.java @@ -50,11 +50,10 @@ public class VocabularyInfo implements Serializable { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ */ private String languageCode; @@ -165,11 +164,10 @@ public VocabularyInfo withVocabularyName(String vocabularyName) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @return

                        * The language code used to create your custom vocabulary. Each @@ -200,11 +198,10 @@ public String getLanguageCode() { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your custom vocabulary. Each @@ -239,11 +236,10 @@ public void setLanguageCode(String languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your custom vocabulary. Each @@ -278,11 +274,10 @@ public VocabularyInfo withLanguageCode(String languageCode) { *

                        *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your custom vocabulary. Each @@ -317,11 +312,10 @@ public void setLanguageCode(LanguageCode languageCode) { * together. *

                        * Constraints:
                        - * Allowed Values: af-ZA, ar-AE, ar-SA, cy-GB, da-DK, de-CH, de-DE, - * en-AB, en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, - * fr-CA, fr-FR, ga-IE, gd-GB, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, - * ms-MY, nl-NL, pt-BR, pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, - * th-TH, en-ZA, en-NZ + * Allowed Values: af-ZA, ar-AE, ar-SA, da-DK, de-CH, de-DE, en-AB, + * en-AU, en-GB, en-IE, en-IN, en-US, en-WL, es-ES, es-US, fa-IR, fr-CA, + * fr-FR, he-IL, hi-IN, id-ID, it-IT, ja-JP, ko-KR, ms-MY, nl-NL, pt-BR, + * pt-PT, ru-RU, ta-IN, te-IN, tr-TR, zh-CN, zh-TW, th-TH, en-ZA, en-NZ * * @param languageCode

                        * The language code used to create your custom vocabulary. Each From f8c1f6f39efc95a95a27c44768e4f895006bd618 Mon Sep 17 00:00:00 2001 From: AWS Mobile SDK Bot <46607340+awsmobilesdk@users.noreply.github.com> Date: Tue, 9 Aug 2022 08:20:57 -0700 Subject: [PATCH 10/14] feat(aws-android-sdk-kms): update models to latest (#2948) Co-authored-by: Erica Eaton <67125657+eeatonaws@users.noreply.github.com> --- .../com/amazonaws/services/kms/AWSKMS.java | 147 +++-- .../amazonaws/services/kms/AWSKMSClient.java | 147 +++-- .../kms/model/ConnectionErrorCodeType.java | 4 +- .../model/CreateCustomKeyStoreRequest.java | 2 +- .../services/kms/model/CreateKeyRequest.java | 542 ++++++++++++------ .../kms/model/CustomKeyStoresListEntry.java | 18 +- .../kms/model/CustomerMasterKeySpec.java | 4 +- .../services/kms/model/DataKeyPairSpec.java | 4 +- .../services/kms/model/DecryptRequest.java | 12 +- .../services/kms/model/DecryptResult.java | 12 +- .../model/DeleteCustomKeyStoreRequest.java | 4 +- .../model/DescribeCustomKeyStoresRequest.java | 2 +- .../kms/model/DescribeKeyRequest.java | 4 +- .../DisconnectCustomKeyStoreRequest.java | 2 +- .../services/kms/model/EncryptRequest.java | 19 +- .../services/kms/model/EncryptResult.java | 12 +- .../kms/model/EncryptionAlgorithmSpec.java | 4 +- .../kms/model/GenerateDataKeyPairRequest.java | 140 +++-- .../kms/model/GenerateDataKeyPairResult.java | 12 +- ...ateDataKeyPairWithoutPlaintextRequest.java | 140 +++-- ...rateDataKeyPairWithoutPlaintextResult.java | 12 +- .../kms/model/GenerateDataKeyRequest.java | 12 +- .../kms/model/GenerateRandomRequest.java | 24 +- .../kms/model/GetPublicKeyRequest.java | 12 +- .../kms/model/GetPublicKeyResult.java | 24 +- .../services/kms/model/KeyMetadata.java | 24 +- .../amazonaws/services/kms/model/KeySpec.java | 4 +- .../kms/model/PutKeyPolicyRequest.java | 206 ++++--- .../services/kms/model/ReEncryptRequest.java | 24 +- .../services/kms/model/ReEncryptResult.java | 24 +- .../kms/model/ReplicateKeyRequest.java | 206 ++++--- .../services/kms/model/SignRequest.java | 18 +- .../services/kms/model/SignResult.java | 18 +- .../kms/model/SigningAlgorithmSpec.java | 4 +- .../kms/model/UpdateAliasRequest.java | 22 +- .../model/UpdateCustomKeyStoreRequest.java | 2 +- .../services/kms/model/VerifyRequest.java | 34 +- .../services/kms/model/VerifyResult.java | 18 +- 38 files changed, 1209 insertions(+), 710 deletions(-) diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java index 6773fb5466..91d5a1b7b9 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMS.java @@ -521,7 +521,7 @@ void createAlias(CreateAliasRequest createAliasRequest) throws AmazonClientExcep *

                        * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                        @@ -761,7 +761,10 @@ CreateGrantResult createGrant(CreateGrantRequest createGrantRequest) * any parameters. The default value for KeySpec, * SYMMETRIC_DEFAULT, and the default value for * KeyUsage, ENCRYPT_DECRYPT, create a symmetric - * encryption KMS key. + * encryption KMS key. For technical details, see SYMMETRIC_DEFAULT key spec in the Key Management Service + * Developer Guide. *

                        *

                        * If you need a key for basic encryption and decryption or you are creating @@ -784,14 +787,14 @@ CreateGrantResult createGrant(CreateGrantRequest createGrantRequest) * properties after the KMS key is created. *

                        *

                        - * Asymmetric KMS keys contain an RSA key pair or an Elliptic Curve (ECC) - * key pair. The private key in an asymmetric KMS key never leaves KMS - * unencrypted. However, you can use the GetPublicKey operation to - * download the public key so it can be used outside of KMS. KMS keys with - * RSA key pairs can be used to encrypt or decrypt data or sign and verify - * messages (but not both). KMS keys with ECC key pairs can be used only to - * sign and verify messages. For information about asymmetric KMS keys, see - * GetPublicKey operation to download the public key so it can be + * used outside of KMS. KMS keys with RSA or SM2 key pairs can be used to + * encrypt or decrypt data or sign and verify messages (but not both). KMS + * keys with ECC key pairs can be used only to sign and verify messages. For + * information about asymmetric KMS keys, see Asymmetric KMS keys in the Key Management Service Developer * Guide. @@ -1230,7 +1233,7 @@ void deleteAlias(DeleteAliasRequest deleteAliasRequest) throws AmazonClientExcep * or keys in the cluster. *

                        *

                        - * The custom key store that you delete cannot contain any KMS KMS keys. Before deleting the key store, verify that you will never * need to use any of the KMS keys in the key store for any * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                        @@ -1402,7 +1405,7 @@ void deleteImportedKeyMaterial(DeleteImportedKeyMaterialRequest deleteImportedKe *

                        * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                        @@ -1534,7 +1537,7 @@ DescribeCustomKeyStoresResult describeCustomKeyStores( * prevent a KMS key from being automatically rotated. For details, see How Automatic Key Rotation Works in Key Management Service + * >How Automatic Key Rotation Works in the Key Management Service * Developer Guide. *

                        *
                        • @@ -1801,7 +1804,7 @@ void disableKeyRotation(DisableKeyRotationRequest disableKeyRotationRequest) *

                        * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                        @@ -2048,7 +2051,7 @@ void enableKeyRotation(EnableKeyRotationRequest enableKeyRotationRequest) *

                        * If you specify an asymmetric KMS key, you must also specify the * encryption algorithm. The algorithm must be compatible with the KMS key - * type. + * spec. *

                        * *

                        @@ -2134,6 +2137,11 @@ void enableKeyRotation(EnableKeyRotationRequest enableKeyRotationRequest) * *

                      *
                      • + *
                    • + *

                      + * SM2PKE: 1024 bytes (China Regions only) + *

                      + *
                      • *
                    *

                    * The KMS key that you use for this operation must be in a compatible key @@ -2208,10 +2216,20 @@ EncryptResult encrypt(EncryptRequest encryptRequest) throws AmazonClientExceptio * To generate a data key, specify the symmetric encryption KMS key that * will be used to encrypt the data key. You cannot use an asymmetric KMS * key to encrypt data keys. To get the type of your KMS key, use the - * DescribeKey operation. You must also specify the length of the - * data key. Use either the KeySpec or - * NumberOfBytes parameters (but not both). For 128-bit and - * 256-bit data keys, use the KeySpec parameter. + * DescribeKey operation. + *

                    + *

                    + * You must also specify the length of the data key. Use either the + * KeySpec or NumberOfBytes parameters (but not + * both). For 128-bit and 256-bit data keys, use the KeySpec + * parameter. + *

                    + *

                    + * To generate an SM4 data key (China Regions only), specify a + * KeySpec value of AES_128 or + * NumberOfBytes value of 128. The symmetric + * encryption key used in China Regions to encrypt your data key is an SM4 + * encryption key. *

                    *

                    * To get only an encrypted copy of the data key, use @@ -2391,10 +2409,11 @@ GenerateDataKeyResult generateDataKey(GenerateDataKeyRequest generateDataKeyRequ *

                    *

                    * Use the KeyPairSpec parameter to choose an RSA or Elliptic - * Curve (ECC) data key pair. KMS recommends that your use ECC key pairs for - * signing, and use RSA key pairs for either encryption or signing, but not - * both. However, KMS cannot enforce any restrictions on the use of data key - * pairs outside of KMS. + * Curve (ECC) data key pair. In China Regions, you can also choose an SM2 + * data key pair. KMS recommends that you use ECC key pairs for signing, and + * use RSA and SM2 key pairs for either encryption or signing, but not both. + * However, KMS cannot enforce any restrictions on the use of data key pairs + * outside of KMS. *

                    *

                    * If you are using the data key pair to encrypt data, or for any operation @@ -2527,10 +2546,11 @@ GenerateDataKeyPairResult generateDataKeyPair( *

                    *

                    * Use the KeyPairSpec parameter to choose an RSA or Elliptic - * Curve (ECC) data key pair. KMS recommends that your use ECC key pairs for - * signing, and use RSA key pairs for either encryption or signing, but not - * both. However, KMS cannot enforce any restrictions on the use of data key - * pairs outside of KMS. + * Curve (ECC) data key pair. In China Regions, you can also choose an SM2 + * data key pair. KMS recommends that you use ECC key pairs for signing, and + * use RSA and SM2 key pairs for either encryption or signing, but not both. + * However, KMS cannot enforce any restrictions on the use of data key pairs + * outside of KMS. *

                    *

                    * GenerateDataKeyPairWithoutPlaintext returns a unique data @@ -2825,6 +2845,11 @@ GenerateMacResult generateMac(GenerateMacRequest generateMacRequest) * Returns a random byte string that is cryptographically secure. *

                    *

                    + * You must use the NumberOfBytes parameter to specify the + * length of the random byte string. There is no default value for string + * length. + *

                    + *

                    * By default, the random byte string is generated in KMS. To generate the * byte string in the CloudHSM cluster that is associated with a . *

                    *

                    + * Cross-account use: Not applicable. GenerateRandom + * does not use any account-specific resources, such as KMS keys. + *

                    + *

                    * Required permissions: kms:GenerateRandom (IAM policy) @@ -3135,10 +3164,15 @@ GetParametersForImportResult getParametersForImport( * When you use the public key within KMS, you benefit from the * authentication, authorization, and logging that are part of every KMS * operation. You also reduce of risk of encrypting data that cannot be - * decrypted. These features are not effective outside of KMS. For details, - * see Special Considerations for Downloading Public Keys. + * decrypted. These features are not effective outside of KMS. + *

                    + *

                    + * To verify a signature outside of KMS with an SM2 public key (China + * Regions only), you must specify the distinguishing ID. By default, KMS + * uses 1234567812345678 as the distinguishing ID. For more + * information, see Offline verification with SM2 key pairs. *

                    *

                    * To help you use the public key safely outside of KMS, @@ -4923,7 +4957,7 @@ void updateAlias(UpdateAliasRequest updateAliasRequest) throws AmazonClientExcep *

                    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                    @@ -5213,12 +5247,17 @@ void updatePrimaryRegion(UpdatePrimaryRegionRequest updatePrimaryRegionRequest) * You can also verify the digital signature by using the public key of the * KMS key outside of KMS. Use the GetPublicKey operation to download * the public key in the asymmetric KMS key and then use the public key to - * verify the signature outside of KMS. The advantage of using the - * Verify operation is that it is performed within KMS. As a - * result, it's easy to call, the operation is performed within the FIPS - * boundary, it is logged in CloudTrail, and you can use key policy and IAM - * policy to determine who is authorized to use the KMS key to verify - * signatures. + * verify the signature outside of KMS. To verify a signature outside of KMS + * with an SM2 public key, you must specify the distinguishing ID. By + * default, KMS uses 1234567812345678 as the distinguishing ID. + * For more information, see Offline verification with SM2 key pairs in Key Management Service + * Developer Guide. The advantage of using the Verify + * operation is that it is performed within KMS. As a result, it's easy to + * call, the operation is performed within the FIPS boundary, it is logged + * in CloudTrail, and you can use key policy and IAM policy to determine who + * is authorized to use the KMS key to verify signatures. *

                    *

                    * The KMS key that you use for this operation must be in a compatible key @@ -5357,7 +5396,10 @@ VerifyMacResult verifyMac(VerifyMacRequest verifyMacRequest) throws AmazonClient * any parameters. The default value for KeySpec, * SYMMETRIC_DEFAULT, and the default value for * KeyUsage, ENCRYPT_DECRYPT, create a symmetric - * encryption KMS key. + * encryption KMS key. For technical details, see SYMMETRIC_DEFAULT key spec in the Key Management Service + * Developer Guide. *

                    *

                    * If you need a key for basic encryption and decryption or you are creating @@ -5380,14 +5422,14 @@ VerifyMacResult verifyMac(VerifyMacRequest verifyMacRequest) throws AmazonClient * properties after the KMS key is created. *

                    *

                    - * Asymmetric KMS keys contain an RSA key pair or an Elliptic Curve (ECC) - * key pair. The private key in an asymmetric KMS key never leaves KMS - * unencrypted. However, you can use the GetPublicKey operation to - * download the public key so it can be used outside of KMS. KMS keys with - * RSA key pairs can be used to encrypt or decrypt data or sign and verify - * messages (but not both). KMS keys with ECC key pairs can be used only to - * sign and verify messages. For information about asymmetric KMS keys, see - * GetPublicKey operation to download the public key so it can be + * used outside of KMS. KMS keys with RSA or SM2 key pairs can be used to + * encrypt or decrypt data or sign and verify messages (but not both). KMS + * keys with ECC key pairs can be used only to sign and verify messages. For + * information about asymmetric KMS keys, see Asymmetric KMS keys in the Key Management Service Developer * Guide. @@ -5791,6 +5833,11 @@ VerifyMacResult verifyMac(VerifyMacRequest verifyMacRequest) throws AmazonClient * Returns a random byte string that is cryptographically secure. *

                    *

                    + * You must use the NumberOfBytes parameter to specify the + * length of the random byte string. There is no default value for string + * length. + *

                    + *

                    * By default, the random byte string is generated in KMS. To generate the * byte string in the CloudHSM cluster that is associated with a . *

                    *

                    + * Cross-account use: Not applicable. GenerateRandom + * does not use any account-specific resources, such as KMS keys. + *

                    + *

                    * Required permissions: kms:GenerateRandom (IAM policy) diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java index 245cf611cc..963a5987af 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/AWSKMSClient.java @@ -889,7 +889,7 @@ public void createAlias(CreateAliasRequest createAliasRequest) *

                    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                    @@ -1182,7 +1182,10 @@ public CreateGrantResult createGrant(CreateGrantRequest createGrantRequest) * any parameters. The default value for KeySpec, * SYMMETRIC_DEFAULT, and the default value for * KeyUsage, ENCRYPT_DECRYPT, create a symmetric - * encryption KMS key. + * encryption KMS key. For technical details, see SYMMETRIC_DEFAULT key spec in the Key Management Service + * Developer Guide. *

                    *

                    * If you need a key for basic encryption and decryption or you are creating @@ -1205,14 +1208,14 @@ public CreateGrantResult createGrant(CreateGrantRequest createGrantRequest) * properties after the KMS key is created. *

                    *

                    - * Asymmetric KMS keys contain an RSA key pair or an Elliptic Curve (ECC) - * key pair. The private key in an asymmetric KMS key never leaves KMS - * unencrypted. However, you can use the GetPublicKey operation to - * download the public key so it can be used outside of KMS. KMS keys with - * RSA key pairs can be used to encrypt or decrypt data or sign and verify - * messages (but not both). KMS keys with ECC key pairs can be used only to - * sign and verify messages. For information about asymmetric KMS keys, see - * GetPublicKey operation to download the public key so it can be + * used outside of KMS. KMS keys with RSA or SM2 key pairs can be used to + * encrypt or decrypt data or sign and verify messages (but not both). KMS + * keys with ECC key pairs can be used only to sign and verify messages. For + * information about asymmetric KMS keys, see Asymmetric KMS keys in the Key Management Service Developer * Guide. @@ -1724,7 +1727,7 @@ public void deleteAlias(DeleteAliasRequest deleteAliasRequest) * or keys in the cluster. *

                    *

                    - * The custom key store that you delete cannot contain any KMS KMS keys. Before deleting the key store, verify that you will never * need to use any of the KMS keys in the key store for any * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                    @@ -1946,7 +1949,7 @@ public void deleteImportedKeyMaterial( *

                    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                    @@ -2105,7 +2108,7 @@ public DescribeCustomKeyStoresResult describeCustomKeyStores( * prevent a KMS key from being automatically rotated. For details, see How Automatic Key Rotation Works in Key Management Service + * >How Automatic Key Rotation Works in the Key Management Service * Developer Guide. *

                    *
                    • @@ -2441,7 +2444,7 @@ public void disableKeyRotation(DisableKeyRotationRequest disableKeyRotationReque *

                    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                    @@ -2758,7 +2761,7 @@ public void enableKeyRotation(EnableKeyRotationRequest enableKeyRotationRequest) *

                    * If you specify an asymmetric KMS key, you must also specify the * encryption algorithm. The algorithm must be compatible with the KMS key - * type. + * spec. *

                    * *

                    @@ -2844,6 +2847,11 @@ public void enableKeyRotation(EnableKeyRotationRequest enableKeyRotationRequest) * *

                  *
                  • + *
                • + *

                  + * SM2PKE: 1024 bytes (China Regions only) + *

                  + *
                  • *
                *

                * The KMS key that you use for this operation must be in a compatible key @@ -2944,10 +2952,20 @@ public EncryptResult encrypt(EncryptRequest encryptRequest) * To generate a data key, specify the symmetric encryption KMS key that * will be used to encrypt the data key. You cannot use an asymmetric KMS * key to encrypt data keys. To get the type of your KMS key, use the - * DescribeKey operation. You must also specify the length of the - * data key. Use either the KeySpec or - * NumberOfBytes parameters (but not both). For 128-bit and - * 256-bit data keys, use the KeySpec parameter. + * DescribeKey operation. + *

                + *

                + * You must also specify the length of the data key. Use either the + * KeySpec or NumberOfBytes parameters (but not + * both). For 128-bit and 256-bit data keys, use the KeySpec + * parameter. + *

                + *

                + * To generate an SM4 data key (China Regions only), specify a + * KeySpec value of AES_128 or + * NumberOfBytes value of 128. The symmetric + * encryption key used in China Regions to encrypt your data key is an SM4 + * encryption key. *

                *

                * To get only an encrypted copy of the data key, use @@ -3153,10 +3171,11 @@ public GenerateDataKeyResult generateDataKey(GenerateDataKeyRequest generateData *

                *

                * Use the KeyPairSpec parameter to choose an RSA or Elliptic - * Curve (ECC) data key pair. KMS recommends that your use ECC key pairs for - * signing, and use RSA key pairs for either encryption or signing, but not - * both. However, KMS cannot enforce any restrictions on the use of data key - * pairs outside of KMS. + * Curve (ECC) data key pair. In China Regions, you can also choose an SM2 + * data key pair. KMS recommends that you use ECC key pairs for signing, and + * use RSA and SM2 key pairs for either encryption or signing, but not both. + * However, KMS cannot enforce any restrictions on the use of data key pairs + * outside of KMS. *

                *

                * If you are using the data key pair to encrypt data, or for any operation @@ -3316,10 +3335,11 @@ public GenerateDataKeyPairResult generateDataKeyPair( *

                *

                * Use the KeyPairSpec parameter to choose an RSA or Elliptic - * Curve (ECC) data key pair. KMS recommends that your use ECC key pairs for - * signing, and use RSA key pairs for either encryption or signing, but not - * both. However, KMS cannot enforce any restrictions on the use of data key - * pairs outside of KMS. + * Curve (ECC) data key pair. In China Regions, you can also choose an SM2 + * data key pair. KMS recommends that you use ECC key pairs for signing, and + * use RSA and SM2 key pairs for either encryption or signing, but not both. + * However, KMS cannot enforce any restrictions on the use of data key pairs + * outside of KMS. *

                *

                * GenerateDataKeyPairWithoutPlaintext returns a unique data @@ -3694,6 +3714,11 @@ public GenerateMacResult generateMac(GenerateMacRequest generateMacRequest) * Returns a random byte string that is cryptographically secure. *

                *

                + * You must use the NumberOfBytes parameter to specify the + * length of the random byte string. There is no default value for string + * length. + *

                + *

                * By default, the random byte string is generated in KMS. To generate the * byte string in the CloudHSM cluster that is associated with a . *

                *

                + * Cross-account use: Not applicable. GenerateRandom + * does not use any account-specific resources, such as KMS keys. + *

                + *

                * Required permissions: kms:GenerateRandom (IAM policy) @@ -4110,10 +4139,15 @@ public GetParametersForImportResult getParametersForImport( * When you use the public key within KMS, you benefit from the * authentication, authorization, and logging that are part of every KMS * operation. You also reduce of risk of encrypting data that cannot be - * decrypted. These features are not effective outside of KMS. For details, - * see Special Considerations for Downloading Public Keys. + * decrypted. These features are not effective outside of KMS. + *

                + *

                + * To verify a signature outside of KMS with an SM2 public key (China + * Regions only), you must specify the distinguishing ID. By default, KMS + * uses 1234567812345678 as the distinguishing ID. For more + * information, see Offline verification with SM2 key pairs. *

                *

                * To help you use the public key safely outside of KMS, @@ -6341,7 +6375,7 @@ public void updateAlias(UpdateAliasRequest updateAliasRequest) *

                * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

                @@ -6702,12 +6736,17 @@ public void updatePrimaryRegion(UpdatePrimaryRegionRequest updatePrimaryRegionRe * You can also verify the digital signature by using the public key of the * KMS key outside of KMS. Use the GetPublicKey operation to download * the public key in the asymmetric KMS key and then use the public key to - * verify the signature outside of KMS. The advantage of using the - * Verify operation is that it is performed within KMS. As a - * result, it's easy to call, the operation is performed within the FIPS - * boundary, it is logged in CloudTrail, and you can use key policy and IAM - * policy to determine who is authorized to use the KMS key to verify - * signatures. + * verify the signature outside of KMS. To verify a signature outside of KMS + * with an SM2 public key, you must specify the distinguishing ID. By + * default, KMS uses 1234567812345678 as the distinguishing ID. + * For more information, see Offline verification with SM2 key pairs in Key Management Service + * Developer Guide. The advantage of using the Verify + * operation is that it is performed within KMS. As a result, it's easy to + * call, the operation is performed within the FIPS boundary, it is logged + * in CloudTrail, and you can use key policy and IAM policy to determine who + * is authorized to use the KMS key to verify signatures. *

                *

                * The KMS key that you use for this operation must be in a compatible key @@ -6898,7 +6937,10 @@ public VerifyMacResult verifyMac(VerifyMacRequest verifyMacRequest) * any parameters. The default value for KeySpec, * SYMMETRIC_DEFAULT, and the default value for * KeyUsage, ENCRYPT_DECRYPT, create a symmetric - * encryption KMS key. + * encryption KMS key. For technical details, see SYMMETRIC_DEFAULT key spec in the Key Management Service + * Developer Guide. *

                *

                * If you need a key for basic encryption and decryption or you are creating @@ -6921,14 +6963,14 @@ public VerifyMacResult verifyMac(VerifyMacRequest verifyMacRequest) * properties after the KMS key is created. *

                *

                - * Asymmetric KMS keys contain an RSA key pair or an Elliptic Curve (ECC) - * key pair. The private key in an asymmetric KMS key never leaves KMS - * unencrypted. However, you can use the GetPublicKey operation to - * download the public key so it can be used outside of KMS. KMS keys with - * RSA key pairs can be used to encrypt or decrypt data or sign and verify - * messages (but not both). KMS keys with ECC key pairs can be used only to - * sign and verify messages. For information about asymmetric KMS keys, see - * GetPublicKey operation to download the public key so it can be + * used outside of KMS. KMS keys with RSA or SM2 key pairs can be used to + * encrypt or decrypt data or sign and verify messages (but not both). KMS + * keys with ECC key pairs can be used only to sign and verify messages. For + * information about asymmetric KMS keys, see Asymmetric KMS keys in the Key Management Service Developer * Guide. @@ -7348,6 +7390,11 @@ public void retireGrant() * Returns a random byte string that is cryptographically secure. *

                *

                + * You must use the NumberOfBytes parameter to specify the + * length of the random byte string. There is no default value for string + * length. + *

                + *

                * By default, the random byte string is generated in KMS. To generate the * byte string in the CloudHSM cluster that is associated with a . *

                *

                + * Cross-account use: Not applicable. GenerateRandom + * does not use any account-specific resources, such as KMS keys. + *

                + *

                * Required permissions: kms:GenerateRandom (IAM policy) diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ConnectionErrorCodeType.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ConnectionErrorCodeType.java index ce350afc4e..7e6f88b436 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ConnectionErrorCodeType.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ConnectionErrorCodeType.java @@ -31,7 +31,8 @@ public enum ConnectionErrorCodeType { USER_LOCKED_OUT("USER_LOCKED_OUT"), USER_NOT_FOUND("USER_NOT_FOUND"), USER_LOGGED_IN("USER_LOGGED_IN"), - SUBNET_NOT_FOUND("SUBNET_NOT_FOUND"); + SUBNET_NOT_FOUND("SUBNET_NOT_FOUND"), + INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET("INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET"); private String value; @@ -56,6 +57,7 @@ public String toString() { enumMap.put("USER_NOT_FOUND", USER_NOT_FOUND); enumMap.put("USER_LOGGED_IN", USER_LOGGED_IN); enumMap.put("SUBNET_NOT_FOUND", SUBNET_NOT_FOUND); + enumMap.put("INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET", INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET); } /** diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateCustomKeyStoreRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateCustomKeyStoreRequest.java index a8af9669c8..d966470ec3 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateCustomKeyStoreRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateCustomKeyStoreRequest.java @@ -30,7 +30,7 @@ *

                * This operation is part of the Custom Key Store feature feature in KMS, which combines the convenience + * >custom key store feature feature in KMS, which combines the convenience * and extensive integration of KMS with the isolation and control of a * single-tenant key store. *

                diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateKeyRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateKeyRequest.java index cb14f3a81c..4d6fca3b4e 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateKeyRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CreateKeyRequest.java @@ -48,7 +48,10 @@ * parameters. The default value for KeySpec, * SYMMETRIC_DEFAULT, and the default value for * KeyUsage, ENCRYPT_DECRYPT, create a symmetric - * encryption KMS key. + * encryption KMS key. For technical details, see SYMMETRIC_DEFAULT key spec in the Key Management Service Developer + * Guide. *

                *

                * If you need a key for basic encryption and decryption or you are creating a @@ -71,13 +74,14 @@ * after the KMS key is created. *

                *

                - * Asymmetric KMS keys contain an RSA key pair or an Elliptic Curve (ECC) key - * pair. The private key in an asymmetric KMS key never leaves KMS unencrypted. - * However, you can use the GetPublicKey operation to download the public - * key so it can be used outside of KMS. KMS keys with RSA key pairs can be used - * to encrypt or decrypt data or sign and verify messages (but not both). KMS - * keys with ECC key pairs can be used only to sign and verify messages. For - * information about asymmetric KMS keys, see GetPublicKey operation to download the public key so it can be used + * outside of KMS. KMS keys with RSA or SM2 key pairs can be used to encrypt or + * decrypt data or sign and verify messages (but not both). KMS keys with ECC + * key pairs can be used only to sign and verify messages. For information about + * asymmetric KMS keys, see Asymmetric KMS keys in the Key Management Service Developer * Guide. @@ -273,36 +277,34 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali *

                • *
              *

              - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

              *
                *
              • *

                - * Up to 32 kilobytes (32768 bytes) - *

                - *
                • - *
              • - *

                - * Must be UTF-8 encoded + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

                *
                • *
              • *

                - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

                *
                • *
              • *

                - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

                *
                • *
              *

              - * For help writing and formatting a JSON policy document, see the Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access * Management User Guide . @@ -370,6 +372,12 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali * SIGN_VERIFY. *

              *
              • + *
            • + *

              + * For asymmetric KMS keys with SM2 key material (China Regions only), + * specify ENCRYPT_DECRYPT or SIGN_VERIFY. + *

              + *
              • *
            *

            * Constraints:
            @@ -391,16 +399,17 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali * Constraints:
            * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 */ private String customerMasterKeySpec; /** *

            * Specifies the type of KMS key to create. The default value, - * SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit - * symmetric key for encryption and decryption. For help choosing a key spec - * for your KMS key, see SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit AES-GCM + * key that is used for encryption and decryption, except in China Regions, + * where it creates a 128-bit symmetric key that uses SM4 encryption. For + * help choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management Service * Developer Guide . @@ -439,7 +448,7 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali *

              *
            • *

              - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

              *
              • *
            @@ -528,12 +537,24 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali *
            • *
          *
          • + *
        • + *

          + * SM2 key pairs (China Regions only) + *

          + *
            + *
          • + *

            + * SM2 + *

            + *
            • + *
          + *
          • *
        *

        * Constraints:
        * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 */ private String keySpec; @@ -593,7 +614,7 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali *

        * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

        @@ -745,36 +766,34 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali *
        • *
      *

      - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

      *
        *
      • *

        - * Up to 32 kilobytes (32768 bytes) - *

        - *
        • - *
      • - *

        - * Must be UTF-8 encoded + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

        *
        • *
      • *

        - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

        *
        • *
      • *

        - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

        *
        • *
      *

      - * For help writing and formatting a JSON policy document, see the Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access * Management User Guide . @@ -826,38 +845,35 @@ public class CreateKeyRequest extends AmazonWebServiceRequest implements Seriali *

      • *
    *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) - *

      - *
      • - *
    • - *

      - * Must be UTF-8 encoded + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 to - * U+00FF. + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

      *
      • *
    • *

      - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * The tab (\u0009), line feed (\u000A), + * and carriage return (\u000D) special characters *

      *
      • *
    *

    - * For help writing and formatting a JSON policy document, see the - * Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and Access * Management User Guide . @@ -908,36 +924,34 @@ public String getPolicy() { *

    • *
*

- * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

*
    *
  • *

    - * Up to 32 kilobytes (32768 bytes) - *

    - *
    • - *
  • - *

    - * Must be UTF-8 encoded + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

    *
    • *
  • *

    - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

    *
    • *
  • *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

    *
    • *
*

- * For help writing and formatting a JSON policy document, see the Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access * Management User Guide . @@ -990,38 +1004,37 @@ public String getPolicy() { * * *

- * A key policy document must conform to the following rules. + * A key policy document can include only the following + * characters: *

*
    *
  • *

    - * Up to 32 kilobytes (32768 bytes) - *

    - *
    • - *
  • - *

    - * Must be UTF-8 encoded + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

    *
    • *
  • *

    - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 - * to U+00FF. + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

    *
    • *
  • *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * The tab (\u0009), line feed (\u000A + * ), and carriage return (\u000D) special + * characters *

    *
    • *
*

- * For help writing and formatting a JSON policy document, see - * the Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and * Access Management User Guide . @@ -1072,36 +1085,34 @@ public void setPolicy(String policy) { * * *

- * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

*
    *
  • *

    - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

    *
    • *
  • *

    - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

    *
    • *
  • *

    - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. - *

    - *
    • - *
  • - *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

    *
    • *
*

- * For help writing and formatting a JSON policy document, see the Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access * Management User Guide . @@ -1157,38 +1168,37 @@ public void setPolicy(String policy) { * * *

- * A key policy document must conform to the following rules. + * A key policy document can include only the following + * characters: *

*
    *
  • *

    - * Up to 32 kilobytes (32768 bytes) - *

    - *
    • - *
  • - *

    - * Must be UTF-8 encoded + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

    *
    • *
  • *

    - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 - * to U+00FF. + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

    *
    • *
  • *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * The tab (\u0009), line feed (\u000A + * ), and carriage return (\u000D) special + * characters *

    *
    • *
*

- * For help writing and formatting a JSON policy document, see - * the Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and * Access Management User Guide . @@ -1346,6 +1356,12 @@ public CreateKeyRequest withDescription(String description) { * SIGN_VERIFY. *

* + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions only), + * specify ENCRYPT_DECRYPT or SIGN_VERIFY. + *

    + *
    • * *

    * Constraints:
    @@ -1388,6 +1404,13 @@ public CreateKeyRequest withDescription(String description) { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions + * only), specify ENCRYPT_DECRYPT or + * SIGN_VERIFY. + *

    + *
    • * * @see KeyUsageType */ @@ -1432,6 +1455,12 @@ public String getKeyUsage() { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions only), + * specify ENCRYPT_DECRYPT or SIGN_VERIFY. + *

    + *
    • * *

    * Constraints:
    @@ -1475,6 +1504,13 @@ public String getKeyUsage() { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions + * only), specify ENCRYPT_DECRYPT or + * SIGN_VERIFY. + *

    + *
    • * * @see KeyUsageType */ @@ -1519,6 +1555,12 @@ public void setKeyUsage(String keyUsage) { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions only), + * specify ENCRYPT_DECRYPT or SIGN_VERIFY. + *

    + *
    • * *

    * Returns a reference to this object so that method calls can be chained @@ -1565,6 +1607,13 @@ public void setKeyUsage(String keyUsage) { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions + * only), specify ENCRYPT_DECRYPT or + * SIGN_VERIFY. + *

    + *
    • * * @return A reference to this updated object so that method calls can be * chained together. @@ -1612,6 +1661,12 @@ public CreateKeyRequest withKeyUsage(String keyUsage) { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions only), + * specify ENCRYPT_DECRYPT or SIGN_VERIFY. + *

    + *
    • * *

    * Constraints:
    @@ -1655,6 +1710,13 @@ public CreateKeyRequest withKeyUsage(String keyUsage) { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions + * only), specify ENCRYPT_DECRYPT or + * SIGN_VERIFY. + *

    + *
    • * * @see KeyUsageType */ @@ -1699,6 +1761,12 @@ public void setKeyUsage(KeyUsageType keyUsage) { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions only), + * specify ENCRYPT_DECRYPT or SIGN_VERIFY. + *

    + *
    • * *

    * Returns a reference to this object so that method calls can be chained @@ -1745,6 +1813,13 @@ public void setKeyUsage(KeyUsageType keyUsage) { * SIGN_VERIFY. *

    * + *
  • + *

    + * For asymmetric KMS keys with SM2 key material (China Regions + * only), specify ENCRYPT_DECRYPT or + * SIGN_VERIFY. + *

    + *
    • * * @return A reference to this updated object so that method calls can be * chained together. @@ -1769,7 +1844,7 @@ public CreateKeyRequest withKeyUsage(KeyUsageType keyUsage) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @return

    * Instead, use the KeySpec parameter. @@ -1801,7 +1876,7 @@ public String getCustomerMasterKeySpec() { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec parameter. @@ -1836,7 +1911,7 @@ public void setCustomerMasterKeySpec(String customerMasterKeySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec parameter. @@ -1871,7 +1946,7 @@ public CreateKeyRequest withCustomerMasterKeySpec(String customerMasterKeySpec) * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec parameter. @@ -1906,7 +1981,7 @@ public void setCustomerMasterKeySpec(CustomerMasterKeySpec customerMasterKeySpec * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec parameter. @@ -1930,9 +2005,10 @@ public CreateKeyRequest withCustomerMasterKeySpec(CustomerMasterKeySpec customer /** *

    * Specifies the type of KMS key to create. The default value, - * SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit - * symmetric key for encryption and decryption. For help choosing a key spec - * for your KMS key, see SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit AES-GCM + * key that is used for encryption and decryption, except in China Regions, + * where it creates a 128-bit symmetric key that uses SM4 encryption. For + * help choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management Service * Developer Guide . @@ -1971,7 +2047,7 @@ public CreateKeyRequest withCustomerMasterKeySpec(CustomerMasterKeySpec customer *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -2060,18 +2136,32 @@ public CreateKeyRequest withCustomerMasterKeySpec(CustomerMasterKeySpec customer * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @return

    * Specifies the type of KMS key to create. The default value, * SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit - * symmetric key for encryption and decryption. For help choosing a - * key spec for your KMS key, see Choosing a KMS key type in the Key Management Service * Developer Guide . @@ -2112,7 +2202,7 @@ public CreateKeyRequest withCustomerMasterKeySpec(CustomerMasterKeySpec customer *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -2201,6 +2291,18 @@ public CreateKeyRequest withCustomerMasterKeySpec(CustomerMasterKeySpec customer * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * * @see KeySpec */ @@ -2211,9 +2313,10 @@ public String getKeySpec() { /** *

    * Specifies the type of KMS key to create. The default value, - * SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit - * symmetric key for encryption and decryption. For help choosing a key spec - * for your KMS key, see SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit AES-GCM + * key that is used for encryption and decryption, except in China Regions, + * where it creates a 128-bit symmetric key that uses SM4 encryption. For + * help choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management Service * Developer Guide . @@ -2252,7 +2355,7 @@ public String getKeySpec() { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -2341,17 +2444,31 @@ public String getKeySpec() { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Specifies the type of KMS key to create. The default value, * SYMMETRIC_DEFAULT, creates a KMS key with a - * 256-bit symmetric key for encryption and decryption. For help + * 256-bit AES-GCM key that is used for encryption and + * decryption, except in China Regions, where it creates a + * 128-bit symmetric key that uses SM4 encryption. For help * choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management @@ -2393,7 +2510,7 @@ public String getKeySpec() { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -2482,6 +2599,18 @@ public String getKeySpec() { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * * @see KeySpec */ @@ -2492,9 +2621,10 @@ public void setKeySpec(String keySpec) { /** *

    * Specifies the type of KMS key to create. The default value, - * SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit - * symmetric key for encryption and decryption. For help choosing a key spec - * for your KMS key, see SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit AES-GCM + * key that is used for encryption and decryption, except in China Regions, + * where it creates a 128-bit symmetric key that uses SM4 encryption. For + * help choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management Service * Developer Guide . @@ -2533,7 +2663,7 @@ public void setKeySpec(String keySpec) { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -2622,6 +2752,18 @@ public void setKeySpec(String keySpec) { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * *

    * Returns a reference to this object so that method calls can be chained @@ -2630,12 +2772,14 @@ public void setKeySpec(String keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Specifies the type of KMS key to create. The default value, * SYMMETRIC_DEFAULT, creates a KMS key with a - * 256-bit symmetric key for encryption and decryption. For help + * 256-bit AES-GCM key that is used for encryption and + * decryption, except in China Regions, where it creates a + * 128-bit symmetric key that uses SM4 encryption. For help * choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management @@ -2677,7 +2821,7 @@ public void setKeySpec(String keySpec) { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -2766,6 +2910,18 @@ public void setKeySpec(String keySpec) { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * * @return A reference to this updated object so that method calls can be * chained together. @@ -2779,9 +2935,10 @@ public CreateKeyRequest withKeySpec(String keySpec) { /** *

    * Specifies the type of KMS key to create. The default value, - * SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit - * symmetric key for encryption and decryption. For help choosing a key spec - * for your KMS key, see SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit AES-GCM + * key that is used for encryption and decryption, except in China Regions, + * where it creates a 128-bit symmetric key that uses SM4 encryption. For + * help choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management Service * Developer Guide . @@ -2820,7 +2977,7 @@ public CreateKeyRequest withKeySpec(String keySpec) { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -2909,17 +3066,31 @@ public CreateKeyRequest withKeySpec(String keySpec) { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Specifies the type of KMS key to create. The default value, * SYMMETRIC_DEFAULT, creates a KMS key with a - * 256-bit symmetric key for encryption and decryption. For help + * 256-bit AES-GCM key that is used for encryption and + * decryption, except in China Regions, where it creates a + * 128-bit symmetric key that uses SM4 encryption. For help * choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management @@ -2961,7 +3132,7 @@ public CreateKeyRequest withKeySpec(String keySpec) { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -3050,6 +3221,18 @@ public CreateKeyRequest withKeySpec(String keySpec) { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * * @see KeySpec */ @@ -3060,9 +3243,10 @@ public void setKeySpec(KeySpec keySpec) { /** *

    * Specifies the type of KMS key to create. The default value, - * SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit - * symmetric key for encryption and decryption. For help choosing a key spec - * for your KMS key, see SYMMETRIC_DEFAULT, creates a KMS key with a 256-bit AES-GCM + * key that is used for encryption and decryption, except in China Regions, + * where it creates a 128-bit symmetric key that uses SM4 encryption. For + * help choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management Service * Developer Guide . @@ -3101,7 +3285,7 @@ public void setKeySpec(KeySpec keySpec) { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -3190,6 +3374,18 @@ public void setKeySpec(KeySpec keySpec) { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * *

    * Returns a reference to this object so that method calls can be chained @@ -3198,12 +3394,14 @@ public void setKeySpec(KeySpec keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Specifies the type of KMS key to create. The default value, * SYMMETRIC_DEFAULT, creates a KMS key with a - * 256-bit symmetric key for encryption and decryption. For help + * 256-bit AES-GCM key that is used for encryption and + * decryption, except in China Regions, where it creates a + * 128-bit symmetric key that uses SM4 encryption. For help * choosing a key spec for your KMS key, see Choosing a KMS key type in the Key Management @@ -3245,7 +3443,7 @@ public void setKeySpec(KeySpec keySpec) { *

      *
    • *

      - * SYMMETRIC_DEFAULT (AES-256-GCM) + * SYMMETRIC_DEFAULT *

      *
      • *
    @@ -3334,6 +3532,18 @@ public void setKeySpec(KeySpec keySpec) { * * * + *
  • + *

    + * SM2 key pairs (China Regions only) + *

    + *
      + *
    • + *

      + * SM2 + *

      + *
      • + *
    + *
    • * * @return A reference to this updated object so that method calls can be * chained together. @@ -3677,7 +3887,7 @@ public CreateKeyRequest withOrigin(OriginType origin) { *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

    @@ -3711,7 +3921,7 @@ public CreateKeyRequest withOrigin(OriginType origin) { *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation * and control of a single-tenant key store. *

    @@ -3747,7 +3957,7 @@ public String getCustomKeyStoreId() { *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

    @@ -3782,7 +3992,7 @@ public String getCustomKeyStoreId() { *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines + * >custom key store feature feature in KMS, which combines * the convenience and extensive integration of KMS with the * isolation and control of a single-tenant key store. *

    @@ -3818,7 +4028,7 @@ public void setCustomKeyStoreId(String customKeyStoreId) { *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines the + * >custom key store feature feature in KMS, which combines the * convenience and extensive integration of KMS with the isolation and * control of a single-tenant key store. *

    @@ -3856,7 +4066,7 @@ public void setCustomKeyStoreId(String customKeyStoreId) { *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines + * >custom key store feature feature in KMS, which combines * the convenience and extensive integration of KMS with the * isolation and control of a single-tenant key store. *

    diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomKeyStoresListEntry.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomKeyStoresListEntry.java index 6349fa1c43..b224dfee6d 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomKeyStoresListEntry.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomKeyStoresListEntry.java @@ -203,7 +203,8 @@ public class CustomKeyStoresListEntry implements Serializable { * Constraints:
    * Allowed Values: INVALID_CREDENTIALS, CLUSTER_NOT_FOUND, * NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS, - * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND + * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND, + * INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET */ private String connectionErrorCode; @@ -883,7 +884,8 @@ public CustomKeyStoresListEntry withConnectionState(ConnectionStateType connecti * Constraints:
    * Allowed Values: INVALID_CREDENTIALS, CLUSTER_NOT_FOUND, * NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS, - * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND + * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND, + * INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET * * @return

    * Describes the connection error. This field appears in the @@ -1095,7 +1097,8 @@ public String getConnectionErrorCode() { * Constraints:
    * Allowed Values: INVALID_CREDENTIALS, CLUSTER_NOT_FOUND, * NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS, - * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND + * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND, + * INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET * * @param connectionErrorCode

    * Describes the connection error. This field appears in the @@ -1311,7 +1314,8 @@ public void setConnectionErrorCode(String connectionErrorCode) { * Constraints:
    * Allowed Values: INVALID_CREDENTIALS, CLUSTER_NOT_FOUND, * NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS, - * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND + * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND, + * INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET * * @param connectionErrorCode

    * Describes the connection error. This field appears in the @@ -1527,7 +1531,8 @@ public CustomKeyStoresListEntry withConnectionErrorCode(String connectionErrorCo * Constraints:
    * Allowed Values: INVALID_CREDENTIALS, CLUSTER_NOT_FOUND, * NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS, - * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND + * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND, + * INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET * * @param connectionErrorCode

    * Describes the connection error. This field appears in the @@ -1743,7 +1748,8 @@ public void setConnectionErrorCode(ConnectionErrorCodeType connectionErrorCode) * Constraints:
    * Allowed Values: INVALID_CREDENTIALS, CLUSTER_NOT_FOUND, * NETWORK_ERRORS, INTERNAL_ERROR, INSUFFICIENT_CLOUDHSM_HSMS, - * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND + * USER_LOCKED_OUT, USER_NOT_FOUND, USER_LOGGED_IN, SUBNET_NOT_FOUND, + * INSUFFICIENT_FREE_ADDRESSES_IN_SUBNET * * @param connectionErrorCode

    * Describes the connection error. This field appears in the diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomerMasterKeySpec.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomerMasterKeySpec.java index 4519bdddd9..3df43ebf69 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomerMasterKeySpec.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/CustomerMasterKeySpec.java @@ -35,7 +35,8 @@ public enum CustomerMasterKeySpec { HMAC_224("HMAC_224"), HMAC_256("HMAC_256"), HMAC_384("HMAC_384"), - HMAC_512("HMAC_512"); + HMAC_512("HMAC_512"), + SM2("SM2"); private String value; @@ -63,6 +64,7 @@ public String toString() { enumMap.put("HMAC_256", HMAC_256); enumMap.put("HMAC_384", HMAC_384); enumMap.put("HMAC_512", HMAC_512); + enumMap.put("SM2", SM2); } /** diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DataKeyPairSpec.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DataKeyPairSpec.java index 47b12191f1..dd6d7938b4 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DataKeyPairSpec.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DataKeyPairSpec.java @@ -29,7 +29,8 @@ public enum DataKeyPairSpec { ECC_NIST_P256("ECC_NIST_P256"), ECC_NIST_P384("ECC_NIST_P384"), ECC_NIST_P521("ECC_NIST_P521"), - ECC_SECG_P256K1("ECC_SECG_P256K1"); + ECC_SECG_P256K1("ECC_SECG_P256K1"), + SM2("SM2"); private String value; @@ -52,6 +53,7 @@ public String toString() { enumMap.put("ECC_NIST_P384", ECC_NIST_P384); enumMap.put("ECC_NIST_P521", ECC_NIST_P521); enumMap.put("ECC_SECG_P256K1", ECC_SECG_P256K1); + enumMap.put("SM2", SM2); } /** diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptRequest.java index fedc353c97..2015821bf1 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptRequest.java @@ -280,7 +280,7 @@ public class DecryptRequest extends AmazonWebServiceRequest implements Serializa *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String encryptionAlgorithm; @@ -1097,7 +1097,7 @@ public DecryptRequest withKeyId(String keyId) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * Specifies the encryption algorithm that will be used to decrypt @@ -1133,7 +1133,7 @@ public String getEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that will be used to @@ -1172,7 +1172,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that will be used to @@ -1211,7 +1211,7 @@ public DecryptRequest withEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that will be used to @@ -1250,7 +1250,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm) *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that will be used to diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptResult.java index a06b6573a1..3c9bb55e5c 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DecryptResult.java @@ -49,7 +49,7 @@ public class DecryptResult implements Serializable { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String encryptionAlgorithm; @@ -195,7 +195,7 @@ public DecryptResult withPlaintext(java.nio.ByteBuffer plaintext) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * The encryption algorithm that was used to decrypt the ciphertext. @@ -213,7 +213,7 @@ public String getEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to decrypt the @@ -235,7 +235,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to decrypt the @@ -257,7 +257,7 @@ public DecryptResult withEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to decrypt the @@ -279,7 +279,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm) *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to decrypt the diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DeleteCustomKeyStoreRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DeleteCustomKeyStoreRequest.java index 90830a64c9..c9b2204aec 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DeleteCustomKeyStoreRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DeleteCustomKeyStoreRequest.java @@ -28,7 +28,7 @@ * the cluster. *

    *

    - * The custom key store that you delete cannot contain any KMS KMS keys. Before deleting the key store, verify that you will never need * to use any of the KMS keys in the key store for any * This operation is part of the Custom Key Store feature feature in KMS, which combines the convenience + * >custom key store feature feature in KMS, which combines the convenience * and extensive integration of KMS with the isolation and control of a * single-tenant key store. *

    diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeCustomKeyStoresRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeCustomKeyStoresRequest.java index ad81837cf3..66fa70500e 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeCustomKeyStoresRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeCustomKeyStoresRequest.java @@ -28,7 +28,7 @@ *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines the convenience + * >custom key store feature feature in KMS, which combines the convenience * and extensive integration of KMS with the isolation and control of a * single-tenant key store. *

    diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeKeyRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeKeyRequest.java index 12e43435da..d4303abc34 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeKeyRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DescribeKeyRequest.java @@ -55,8 +55,8 @@ * information, use GetKeyRotationStatus. Also, some key states prevent a * KMS key from being automatically rotated. For details, see How Automatic Key Rotation Works in Key Management Service Developer - * Guide. + * >How Automatic Key Rotation Works in the Key Management Service + * Developer Guide. *

    * *
  • diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DisconnectCustomKeyStoreRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DisconnectCustomKeyStoreRequest.java index 726ecb8823..75ab539982 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DisconnectCustomKeyStoreRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/DisconnectCustomKeyStoreRequest.java @@ -49,7 +49,7 @@ *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines the convenience + * >custom key store feature feature in KMS, which combines the convenience * and extensive integration of KMS with the isolation and control of a * single-tenant key store. *

    diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptRequest.java index 024b6a9e2e..c9a43aa313 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptRequest.java @@ -45,7 +45,7 @@ *

    *

    * If you specify an asymmetric KMS key, you must also specify the encryption - * algorithm. The algorithm must be compatible with the KMS key type. + * algorithm. The algorithm must be compatible with the KMS key spec. *

    * *

    @@ -131,6 +131,11 @@ *

    • * * + *
  • + *

    + * SM2PKE: 1024 bytes (China Regions only) + *

    + *
    • * *

    * The KMS key that you use for this operation must be in a compatible key @@ -291,7 +296,7 @@ public class EncryptRequest extends AmazonWebServiceRequest implements Serializa *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String encryptionAlgorithm; @@ -1049,7 +1054,7 @@ public EncryptRequest withGrantTokens(java.util.Collection grantTokens) *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * Specifies the encryption algorithm that KMS will use to encrypt @@ -1083,7 +1088,7 @@ public String getEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1120,7 +1125,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1157,7 +1162,7 @@ public EncryptRequest withEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1194,7 +1199,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm) *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptResult.java index 4386b0bba3..7d219bf510 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptResult.java @@ -49,7 +49,7 @@ public class EncryptResult implements Serializable { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String encryptionAlgorithm; @@ -195,7 +195,7 @@ public EncryptResult withKeyId(String keyId) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * The encryption algorithm that was used to encrypt the plaintext. @@ -213,7 +213,7 @@ public String getEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to encrypt the @@ -235,7 +235,7 @@ public void setEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to encrypt the @@ -257,7 +257,7 @@ public EncryptResult withEncryptionAlgorithm(String encryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to encrypt the @@ -279,7 +279,7 @@ public void setEncryptionAlgorithm(EncryptionAlgorithmSpec encryptionAlgorithm) *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param encryptionAlgorithm

    * The encryption algorithm that was used to encrypt the diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptionAlgorithmSpec.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptionAlgorithmSpec.java index da557c3031..c4e4c81ebb 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptionAlgorithmSpec.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/EncryptionAlgorithmSpec.java @@ -25,7 +25,8 @@ public enum EncryptionAlgorithmSpec { SYMMETRIC_DEFAULT("SYMMETRIC_DEFAULT"), RSAES_OAEP_SHA_1("RSAES_OAEP_SHA_1"), - RSAES_OAEP_SHA_256("RSAES_OAEP_SHA_256"); + RSAES_OAEP_SHA_256("RSAES_OAEP_SHA_256"), + SM2PKE("SM2PKE"); private String value; @@ -44,6 +45,7 @@ public String toString() { enumMap.put("SYMMETRIC_DEFAULT", SYMMETRIC_DEFAULT); enumMap.put("RSAES_OAEP_SHA_1", RSAES_OAEP_SHA_1); enumMap.put("RSAES_OAEP_SHA_256", RSAES_OAEP_SHA_256); + enumMap.put("SM2PKE", SM2PKE); } /** diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairRequest.java index 5b4c26d1ab..99d9fbb6d0 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairRequest.java @@ -44,10 +44,10 @@ *

    *

    * Use the KeyPairSpec parameter to choose an RSA or Elliptic Curve - * (ECC) data key pair. KMS recommends that your use ECC key pairs for signing, - * and use RSA key pairs for either encryption or signing, but not both. - * However, KMS cannot enforce any restrictions on the use of data key pairs - * outside of KMS. + * (ECC) data key pair. In China Regions, you can also choose an SM2 data key + * pair. KMS recommends that you use ECC key pairs for signing, and use RSA and + * SM2 key pairs for either encryption or signing, but not both. However, KMS + * cannot enforce any restrictions on the use of data key pairs outside of KMS. *

    *

    * If you are using the data key pair to encrypt data, or for any operation @@ -206,15 +206,17 @@ public class GenerateDataKeyPairRequest extends AmazonWebServiceRequest implemen * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 */ private String keyPairSpec; @@ -745,25 +747,29 @@ public GenerateDataKeyPairRequest withKeyId(String keyId) { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @return

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to - * encrypt and decrypt or to sign and verify (but not both), and the - * rule that permits you to use ECC KMS keys only to sign and - * verify, are not effective on data key pairs, which are used - * outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS + * keys to encrypt and decrypt or to sign and verify (but not both), + * and the rule that permits you to use ECC KMS keys only to sign + * and verify, are not effective on data key pairs, which are used + * outside of KMS. The SM2 key spec is only available in China + * Regions. RSA and ECC asymmetric key pairs are also available in + * China Regions. *

    * @see DataKeyPairSpec */ @@ -776,25 +782,29 @@ public String getKeyPairSpec() { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @see DataKeyPairSpec */ @@ -807,10 +817,12 @@ public void setKeyPairSpec(String keyPairSpec) { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -818,17 +830,19 @@ public void setKeyPairSpec(String keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @return A reference to this updated object so that method calls can be * chained together. @@ -844,25 +858,29 @@ public GenerateDataKeyPairRequest withKeyPairSpec(String keyPairSpec) { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @see DataKeyPairSpec */ @@ -875,10 +893,12 @@ public void setKeyPairSpec(DataKeyPairSpec keyPairSpec) { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -886,17 +906,19 @@ public void setKeyPairSpec(DataKeyPairSpec keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairResult.java index 08f2ab36b4..fb027a3cae 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairResult.java @@ -73,7 +73,7 @@ public class GenerateDataKeyPairResult implements Serializable { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 */ private String keyPairSpec; @@ -349,7 +349,7 @@ public GenerateDataKeyPairResult withKeyId(String keyId) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @return

    * The type of data key pair that was generated. @@ -367,7 +367,7 @@ public String getKeyPairSpec() { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. @@ -388,7 +388,7 @@ public void setKeyPairSpec(String keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. @@ -409,7 +409,7 @@ public GenerateDataKeyPairResult withKeyPairSpec(String keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. @@ -430,7 +430,7 @@ public void setKeyPairSpec(DataKeyPairSpec keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextRequest.java index 6074279952..7270a094a5 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextRequest.java @@ -43,10 +43,10 @@ *

    *

    * Use the KeyPairSpec parameter to choose an RSA or Elliptic Curve - * (ECC) data key pair. KMS recommends that your use ECC key pairs for signing, - * and use RSA key pairs for either encryption or signing, but not both. - * However, KMS cannot enforce any restrictions on the use of data key pairs - * outside of KMS. + * (ECC) data key pair. In China Regions, you can also choose an SM2 data key + * pair. KMS recommends that you use ECC key pairs for signing, and use RSA and + * SM2 key pairs for either encryption or signing, but not both. However, KMS + * cannot enforce any restrictions on the use of data key pairs outside of KMS. *

    *

    * GenerateDataKeyPairWithoutPlaintext returns a unique data key @@ -194,15 +194,17 @@ public class GenerateDataKeyPairWithoutPlaintextRequest extends AmazonWebService * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 */ private String keyPairSpec; @@ -734,25 +736,29 @@ public GenerateDataKeyPairWithoutPlaintextRequest withKeyId(String keyId) { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @return

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to - * encrypt and decrypt or to sign and verify (but not both), and the - * rule that permits you to use ECC KMS keys only to sign and - * verify, are not effective on data key pairs, which are used - * outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS + * keys to encrypt and decrypt or to sign and verify (but not both), + * and the rule that permits you to use ECC KMS keys only to sign + * and verify, are not effective on data key pairs, which are used + * outside of KMS. The SM2 key spec is only available in China + * Regions. RSA and ECC asymmetric key pairs are also available in + * China Regions. *

    * @see DataKeyPairSpec */ @@ -765,25 +771,29 @@ public String getKeyPairSpec() { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @see DataKeyPairSpec */ @@ -796,10 +806,12 @@ public void setKeyPairSpec(String keyPairSpec) { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -807,17 +819,19 @@ public void setKeyPairSpec(String keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @return A reference to this updated object so that method calls can be * chained together. @@ -833,25 +847,29 @@ public GenerateDataKeyPairWithoutPlaintextRequest withKeyPairSpec(String keyPair * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @see DataKeyPairSpec */ @@ -864,10 +882,12 @@ public void setKeyPairSpec(DataKeyPairSpec keyPairSpec) { * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys to encrypt - * and decrypt or to sign and verify (but not both), and the rule that - * permits you to use ECC KMS keys only to sign and verify, are not - * effective on data key pairs, which are used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 KMS keys to + * encrypt and decrypt or to sign and verify (but not both), and the rule + * that permits you to use ECC KMS keys only to sign and verify, are not + * effective on data key pairs, which are used outside of KMS. The SM2 key + * spec is only available in China Regions. RSA and ECC asymmetric key pairs + * are also available in China Regions. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -875,17 +895,19 @@ public void setKeyPairSpec(DataKeyPairSpec keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * Determines the type of data key pair that is generated. *

    *

    - * The KMS rule that restricts the use of asymmetric RSA KMS keys - * to encrypt and decrypt or to sign and verify (but not both), - * and the rule that permits you to use ECC KMS keys only to sign - * and verify, are not effective on data key pairs, which are - * used outside of KMS. + * The KMS rule that restricts the use of asymmetric RSA and SM2 + * KMS keys to encrypt and decrypt or to sign and verify (but not + * both), and the rule that permits you to use ECC KMS keys only + * to sign and verify, are not effective on data key pairs, which + * are used outside of KMS. The SM2 key spec is only available in + * China Regions. RSA and ECC asymmetric key pairs are also + * available in China Regions. *

    * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextResult.java index f1652007c5..6306610f65 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyPairWithoutPlaintextResult.java @@ -61,7 +61,7 @@ public class GenerateDataKeyPairWithoutPlaintextResult implements Serializable { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 */ private String keyPairSpec; @@ -271,7 +271,7 @@ public GenerateDataKeyPairWithoutPlaintextResult withKeyId(String keyId) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @return

    * The type of data key pair that was generated. @@ -289,7 +289,7 @@ public String getKeyPairSpec() { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. @@ -310,7 +310,7 @@ public void setKeyPairSpec(String keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. @@ -331,7 +331,7 @@ public GenerateDataKeyPairWithoutPlaintextResult withKeyPairSpec(String keyPairS *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. @@ -352,7 +352,7 @@ public void setKeyPairSpec(DataKeyPairSpec keyPairSpec) { *

    * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, - * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1 + * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SM2 * * @param keyPairSpec

    * The type of data key pair that was generated. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyRequest.java index cd6d9fbf29..fac37bbe60 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateDataKeyRequest.java @@ -32,11 +32,21 @@ * To generate a data key, specify the symmetric encryption KMS key that will be * used to encrypt the data key. You cannot use an asymmetric KMS key to encrypt * data keys. To get the type of your KMS key, use the DescribeKey - * operation. You must also specify the length of the data key. Use either the + * operation. + *

    + *

    + * You must also specify the length of the data key. Use either the * KeySpec or NumberOfBytes parameters (but not both). * For 128-bit and 256-bit data keys, use the KeySpec parameter. *

    *

    + * To generate an SM4 data key (China Regions only), specify a + * KeySpec value of AES_128 or + * NumberOfBytes value of 128. The symmetric + * encryption key used in China Regions to encrypt your data key is an SM4 + * encryption key. + *

    + *

    * To get only an encrypted copy of the data key, use * GenerateDataKeyWithoutPlaintext. To generate an asymmetric data key * pair, use the GenerateDataKeyPair or diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateRandomRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateRandomRequest.java index 475fdf84ed..78a3d02f6a 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateRandomRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GenerateRandomRequest.java @@ -24,6 +24,10 @@ * Returns a random byte string that is cryptographically secure. *

    *

    + * You must use the NumberOfBytes parameter to specify the length + * of the random byte string. There is no default value for string length. + *

    + *

    * By default, the random byte string is generated in KMS. To generate the byte * string in the CloudHSM cluster that is associated with a . *

    *

    + * Cross-account use: Not applicable. GenerateRandom does + * not use any account-specific resources, such as KMS keys. + *

    + *

    * Required permissions: kms:GenerateRandom (IAM policy) @@ -52,7 +60,7 @@ public class GenerateRandomRequest extends AmazonWebServiceRequest implements Serializable { /** *

    - * The length of the byte string. + * The length of the random byte string. This parameter is required. *

    *

    * Constraints:
    @@ -76,14 +84,14 @@ public class GenerateRandomRequest extends AmazonWebServiceRequest implements Se /** *

    - * The length of the byte string. + * The length of the random byte string. This parameter is required. *

    *

    * Constraints:
    * Range: 1 - 1024
    * * @return

    - * The length of the byte string. + * The length of the random byte string. This parameter is required. *

    */ public Integer getNumberOfBytes() { @@ -92,14 +100,15 @@ public Integer getNumberOfBytes() { /** *

    - * The length of the byte string. + * The length of the random byte string. This parameter is required. *

    *

    * Constraints:
    * Range: 1 - 1024
    * * @param numberOfBytes

    - * The length of the byte string. + * The length of the random byte string. This parameter is + * required. *

    */ public void setNumberOfBytes(Integer numberOfBytes) { @@ -108,7 +117,7 @@ public void setNumberOfBytes(Integer numberOfBytes) { /** *

    - * The length of the byte string. + * The length of the random byte string. This parameter is required. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -118,7 +127,8 @@ public void setNumberOfBytes(Integer numberOfBytes) { * Range: 1 - 1024
    * * @param numberOfBytes

    - * The length of the byte string. + * The length of the random byte string. This parameter is + * required. *

    * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyRequest.java index 992418f1e9..51ffd848b3 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyRequest.java @@ -38,9 +38,15 @@ * you use the public key within KMS, you benefit from the authentication, * authorization, and logging that are part of every KMS operation. You also * reduce of risk of encrypting data that cannot be decrypted. These features - * are not effective outside of KMS. For details, see Special Considerations for Downloading Public Keys. + * are not effective outside of KMS. + *

    + *

    + * To verify a signature outside of KMS with an SM2 public key (China Regions + * only), you must specify the distinguishing ID. By default, KMS uses + * 1234567812345678 as the distinguishing ID. For more information, + * see Offline verification with SM2 key pairs. *

    *

    * To help you use the public key safely outside of KMS, diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyResult.java index a8ce632d0b..e33333dade 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/GetPublicKeyResult.java @@ -64,7 +64,7 @@ public class GetPublicKeyResult implements Serializable { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 */ private String customerMasterKeySpec; @@ -76,7 +76,7 @@ public class GetPublicKeyResult implements Serializable { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 */ private String keySpec; @@ -312,7 +312,7 @@ public GetPublicKeyResult withPublicKey(java.nio.ByteBuffer publicKey) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @return

    * Instead, use the KeySpec field in the @@ -345,7 +345,7 @@ public String getCustomerMasterKeySpec() { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field in the @@ -382,7 +382,7 @@ public void setCustomerMasterKeySpec(String customerMasterKeySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field in the @@ -419,7 +419,7 @@ public GetPublicKeyResult withCustomerMasterKeySpec(String customerMasterKeySpec * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field in the @@ -456,7 +456,7 @@ public void setCustomerMasterKeySpec(CustomerMasterKeySpec customerMasterKeySpec * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field in the @@ -486,7 +486,7 @@ public GetPublicKeyResult withCustomerMasterKeySpec(CustomerMasterKeySpec custom * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @return

    * The type of the of the public key that was downloaded. @@ -505,7 +505,7 @@ public String getKeySpec() { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * The type of the of the public key that was downloaded. @@ -527,7 +527,7 @@ public void setKeySpec(String keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * The type of the of the public key that was downloaded. @@ -549,7 +549,7 @@ public GetPublicKeyResult withKeySpec(String keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * The type of the of the public key that was downloaded. @@ -571,7 +571,7 @@ public void setKeySpec(KeySpec keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * The type of the of the public key that was downloaded. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeyMetadata.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeyMetadata.java index 1b3678a907..5ad1583f3f 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeyMetadata.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeyMetadata.java @@ -223,7 +223,7 @@ public class KeyMetadata implements Serializable { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 */ private String customerMasterKeySpec; @@ -235,7 +235,7 @@ public class KeyMetadata implements Serializable { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 */ private String keySpec; @@ -1758,7 +1758,7 @@ public KeyMetadata withKeyManager(KeyManagerType keyManager) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @return

    * Instead, use the KeySpec field. @@ -1789,7 +1789,7 @@ public String getCustomerMasterKeySpec() { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field. @@ -1824,7 +1824,7 @@ public void setCustomerMasterKeySpec(String customerMasterKeySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field. @@ -1859,7 +1859,7 @@ public KeyMetadata withCustomerMasterKeySpec(String customerMasterKeySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field. @@ -1894,7 +1894,7 @@ public void setCustomerMasterKeySpec(CustomerMasterKeySpec customerMasterKeySpec * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param customerMasterKeySpec

    * Instead, use the KeySpec field. @@ -1923,7 +1923,7 @@ public KeyMetadata withCustomerMasterKeySpec(CustomerMasterKeySpec customerMaste * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @return

    * Describes the type of key material in the KMS key. @@ -1942,7 +1942,7 @@ public String getKeySpec() { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Describes the type of key material in the KMS key. @@ -1964,7 +1964,7 @@ public void setKeySpec(String keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Describes the type of key material in the KMS key. @@ -1986,7 +1986,7 @@ public KeyMetadata withKeySpec(String keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Describes the type of key material in the KMS key. @@ -2008,7 +2008,7 @@ public void setKeySpec(KeySpec keySpec) { * Constraints:
    * Allowed Values: RSA_2048, RSA_3072, RSA_4096, ECC_NIST_P256, * ECC_NIST_P384, ECC_NIST_P521, ECC_SECG_P256K1, SYMMETRIC_DEFAULT, - * HMAC_224, HMAC_256, HMAC_384, HMAC_512 + * HMAC_224, HMAC_256, HMAC_384, HMAC_512, SM2 * * @param keySpec

    * Describes the type of key material in the KMS key. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeySpec.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeySpec.java index e138fb95d6..2a9f9ef39d 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeySpec.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/KeySpec.java @@ -34,7 +34,8 @@ public enum KeySpec { HMAC_224("HMAC_224"), HMAC_256("HMAC_256"), HMAC_384("HMAC_384"), - HMAC_512("HMAC_512"); + HMAC_512("HMAC_512"), + SM2("SM2"); private String value; @@ -62,6 +63,7 @@ public String toString() { enumMap.put("HMAC_256", HMAC_256); enumMap.put("HMAC_384", HMAC_384); enumMap.put("HMAC_512", HMAC_512); + enumMap.put("SM2", SM2); } /** diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/PutKeyPolicyRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/PutKeyPolicyRequest.java index c73bdccc63..4b70571170 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/PutKeyPolicyRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/PutKeyPolicyRequest.java @@ -130,34 +130,38 @@ public class PutKeyPolicyRequest extends AmazonWebServiceRequest implements Seri * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Constraints:
    * Length: 1 - 131072
    @@ -480,34 +484,38 @@ public PutKeyPolicyRequest withPolicyName(String policyName) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Constraints:
    * Length: 1 - 131072
    @@ -550,35 +558,39 @@ public PutKeyPolicyRequest withPolicyName(String policyName) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 to - * U+00FF. + * The tab (\u0009), line feed (\u000A), + * and carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * */ public String getPolicy() { return policy; @@ -620,34 +632,38 @@ public String getPolicy() { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Constraints:
    * Length: 1 - 131072
    @@ -690,35 +706,41 @@ public String getPolicy() { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following + * characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 - * to U+00FF. + * The tab (\u0009), line feed (\u000A + * ), and carriage return (\u000D) special + * characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and + * Access Management User Guide . *

    - * - * */ public void setPolicy(String policy) { this.policy = policy; @@ -760,34 +782,38 @@ public void setPolicy(String policy) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Returns a reference to this object so that method calls can be chained * together. @@ -833,35 +859,41 @@ public void setPolicy(String policy) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following + * characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 - * to U+00FF. + * The tab (\u0009), line feed (\u000A + * ), and carriage return (\u000D) special + * characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and + * Access Management User Guide . *

    - * - * * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptRequest.java index 83b3d54a20..7d51ea9707 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptRequest.java @@ -356,7 +356,7 @@ public class ReEncryptRequest extends AmazonWebServiceRequest implements Seriali *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String sourceEncryptionAlgorithm; @@ -374,7 +374,7 @@ public class ReEncryptRequest extends AmazonWebServiceRequest implements Seriali *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String destinationEncryptionAlgorithm; @@ -1584,7 +1584,7 @@ public ReEncryptRequest clearDestinationEncryptionContextEntries() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * Specifies the encryption algorithm that KMS will use to decrypt @@ -1625,7 +1625,7 @@ public String getSourceEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1669,7 +1669,7 @@ public void setSourceEncryptionAlgorithm(String sourceEncryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1713,7 +1713,7 @@ public ReEncryptRequest withSourceEncryptionAlgorithm(String sourceEncryptionAlg *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1757,7 +1757,7 @@ public void setSourceEncryptionAlgorithm(EncryptionAlgorithmSpec sourceEncryptio *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1798,7 +1798,7 @@ public ReEncryptRequest withSourceEncryptionAlgorithm( *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * Specifies the encryption algorithm that KMS will use to reecrypt @@ -1830,7 +1830,7 @@ public String getDestinationEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1865,7 +1865,7 @@ public void setDestinationEncryptionAlgorithm(String destinationEncryptionAlgori *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1900,7 +1900,7 @@ public ReEncryptRequest withDestinationEncryptionAlgorithm(String destinationEnc *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to @@ -1936,7 +1936,7 @@ public void setDestinationEncryptionAlgorithm( *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * Specifies the encryption algorithm that KMS will use to diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptResult.java index c677497800..0ce55b5897 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReEncryptResult.java @@ -60,7 +60,7 @@ public class ReEncryptResult implements Serializable { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String sourceEncryptionAlgorithm; @@ -71,7 +71,7 @@ public class ReEncryptResult implements Serializable { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE */ private String destinationEncryptionAlgorithm; @@ -274,7 +274,7 @@ public ReEncryptResult withKeyId(String keyId) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * The encryption algorithm that was used to decrypt the ciphertext @@ -294,7 +294,7 @@ public String getSourceEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * The encryption algorithm that was used to decrypt the @@ -317,7 +317,7 @@ public void setSourceEncryptionAlgorithm(String sourceEncryptionAlgorithm) { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * The encryption algorithm that was used to decrypt the @@ -340,7 +340,7 @@ public ReEncryptResult withSourceEncryptionAlgorithm(String sourceEncryptionAlgo *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * The encryption algorithm that was used to decrypt the @@ -363,7 +363,7 @@ public void setSourceEncryptionAlgorithm(EncryptionAlgorithmSpec sourceEncryptio *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param sourceEncryptionAlgorithm

    * The encryption algorithm that was used to decrypt the @@ -386,7 +386,7 @@ public ReEncryptResult withSourceEncryptionAlgorithm( *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @return

    * The encryption algorithm that was used to reencrypt the data. @@ -404,7 +404,7 @@ public String getDestinationEncryptionAlgorithm() { *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * The encryption algorithm that was used to reencrypt the data. @@ -425,7 +425,7 @@ public void setDestinationEncryptionAlgorithm(String destinationEncryptionAlgori *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * The encryption algorithm that was used to reencrypt the data. @@ -446,7 +446,7 @@ public ReEncryptResult withDestinationEncryptionAlgorithm(String destinationEncr *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * The encryption algorithm that was used to reencrypt the data. @@ -468,7 +468,7 @@ public void setDestinationEncryptionAlgorithm( *

    * Constraints:
    * Allowed Values: SYMMETRIC_DEFAULT, RSAES_OAEP_SHA_1, - * RSAES_OAEP_SHA_256 + * RSAES_OAEP_SHA_256, SM2PKE * * @param destinationEncryptionAlgorithm

    * The encryption algorithm that was used to reencrypt the data. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReplicateKeyRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReplicateKeyRequest.java index 390123d021..a200184175 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReplicateKeyRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/ReplicateKeyRequest.java @@ -284,34 +284,38 @@ public class ReplicateKeyRequest extends AmazonWebServiceRequest implements Seri * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Constraints:
    * Length: 1 - 131072
    @@ -944,34 +948,38 @@ public ReplicateKeyRequest withReplicaRegion(String replicaRegion) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Constraints:
    * Length: 1 - 131072
    @@ -1022,35 +1030,39 @@ public ReplicateKeyRequest withReplicaRegion(String replicaRegion) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 to - * U+00FF. + * The tab (\u0009), line feed (\u000A), + * and carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * */ public String getPolicy() { return policy; @@ -1098,34 +1110,38 @@ public String getPolicy() { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Constraints:
    * Length: 1 - 131072
    @@ -1177,35 +1193,41 @@ public String getPolicy() { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following + * characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 - * to U+00FF. + * The tab (\u0009), line feed (\u000A + * ), and carriage return (\u000D) special + * characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and + * Access Management User Guide . *

    - * - * */ public void setPolicy(String policy) { this.policy = policy; @@ -1253,34 +1275,38 @@ public void setPolicy(String policy) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character (\u0020) + * through the end of the ASCII character range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement character + * set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy document - * are the horizontal tab (U+0009), linefeed (U+000A), carriage return - * (U+000D), and characters in the range U+0020 to U+00FF. + * The tab (\u0009), line feed (\u000A), and + * carriage return (\u000D) special characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can include - * spaces. (Spaces are prohibited in the Sid element of an IAM - * policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service Developer + * Guide. For help writing and formatting a JSON policy document, see + * the IAM JSON Policy Reference in the Identity and Access + * Management User Guide . *

    - * - * *

    * Returns a reference to this object so that method calls can be chained * together. @@ -1335,35 +1361,41 @@ public void setPolicy(String policy) { * * *

    - * A key policy document must conform to the following rules. + * A key policy document can include only the following + * characters: *

    *
      *
    • *

      - * Up to 32 kilobytes (32768 bytes) + * Printable ASCII characters from the space character ( + * \u0020) through the end of the ASCII character + * range. *

      *
      • *
    • *

      - * Must be UTF-8 encoded + * Printable characters in the Basic Latin and Latin-1 Supplement + * character set (through \u00FF). *

      *
      • *
    • *

      - * The only Unicode characters that are permitted in a key policy - * document are the horizontal tab (U+0009), linefeed (U+000A), - * carriage return (U+000D), and characters in the range U+0020 - * to U+00FF. + * The tab (\u0009), line feed (\u000A + * ), and carriage return (\u000D) special + * characters *

      *
      • - *
    • + *
    *

    - * The Sid element in a key policy statement can - * include spaces. (Spaces are prohibited in the Sid - * element of an IAM policy document.) + * For information about key policies, see Key policies in KMS in the Key Management Service + * Developer Guide. For help writing and formatting a JSON + * policy document, see the IAM JSON Policy Reference in the Identity and + * Access Management User Guide . *

    - * - * * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignRequest.java index 372f4b757b..8002f8e3da 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignRequest.java @@ -214,7 +214,8 @@ public class SignRequest extends AmazonWebServiceRequest implements Serializable * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA */ private String signingAlgorithm; @@ -898,7 +899,8 @@ public SignRequest withGrantTokens(java.util.Collection grantTokens) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @return

    * Specifies the signing algorithm to use when signing the message. @@ -925,7 +927,8 @@ public String getSigningAlgorithm() { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * Specifies the signing algorithm to use when signing the @@ -956,7 +959,8 @@ public void setSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * Specifies the signing algorithm to use when signing the @@ -987,7 +991,8 @@ public SignRequest withSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * Specifies the signing algorithm to use when signing the @@ -1018,7 +1023,8 @@ public void setSigningAlgorithm(SigningAlgorithmSpec signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * Specifies the signing algorithm to use when signing the diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignResult.java index 4692de9076..27652ff2b2 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SignResult.java @@ -72,7 +72,8 @@ public class SignResult implements Serializable { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA */ private String signingAlgorithm; @@ -356,7 +357,8 @@ public SignResult withSignature(java.nio.ByteBuffer signature) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @return

    * The signing algorithm that was used to sign the message. @@ -375,7 +377,8 @@ public String getSigningAlgorithm() { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. @@ -397,7 +400,8 @@ public void setSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. @@ -419,7 +423,8 @@ public SignResult withSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. @@ -441,7 +446,8 @@ public void setSigningAlgorithm(SigningAlgorithmSpec signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SigningAlgorithmSpec.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SigningAlgorithmSpec.java index 72f66c97f2..ca4332322d 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SigningAlgorithmSpec.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/SigningAlgorithmSpec.java @@ -31,7 +31,8 @@ public enum SigningAlgorithmSpec { RSASSA_PKCS1_V1_5_SHA_512("RSASSA_PKCS1_V1_5_SHA_512"), ECDSA_SHA_256("ECDSA_SHA_256"), ECDSA_SHA_384("ECDSA_SHA_384"), - ECDSA_SHA_512("ECDSA_SHA_512"); + ECDSA_SHA_512("ECDSA_SHA_512"), + SM2DSA("SM2DSA"); private String value; @@ -56,6 +57,7 @@ public String toString() { enumMap.put("ECDSA_SHA_256", ECDSA_SHA_256); enumMap.put("ECDSA_SHA_384", ECDSA_SHA_384); enumMap.put("ECDSA_SHA_512", ECDSA_SHA_512); + enumMap.put("SM2DSA", SM2DSA); } /** diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateAliasRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateAliasRequest.java index e033c64259..93d9a1c77f 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateAliasRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateAliasRequest.java @@ -123,8 +123,8 @@ public class UpdateAliasRequest extends AmazonWebServiceRequest implements Seria *

    * Identifies the alias that is changing its KMS key. This value must begin * with alias/ followed by the alias name, such as - * alias/ExampleAlias. You cannot use UpdateAlias to change the - * alias name. + * alias/ExampleAlias. You cannot use UpdateAlias + * to change the alias name. *

    *

    * Constraints:
    @@ -185,8 +185,8 @@ public class UpdateAliasRequest extends AmazonWebServiceRequest implements Seria *

    * Identifies the alias that is changing its KMS key. This value must begin * with alias/ followed by the alias name, such as - * alias/ExampleAlias. You cannot use UpdateAlias to change the - * alias name. + * alias/ExampleAlias. You cannot use UpdateAlias + * to change the alias name. *

    *

    * Constraints:
    @@ -197,7 +197,7 @@ public class UpdateAliasRequest extends AmazonWebServiceRequest implements Seria * Identifies the alias that is changing its KMS key. This value * must begin with alias/ followed by the alias name, * such as alias/ExampleAlias. You cannot use - * UpdateAlias to change the alias name. + * UpdateAlias to change the alias name. *

    */ public String getAliasName() { @@ -208,8 +208,8 @@ public String getAliasName() { *

    * Identifies the alias that is changing its KMS key. This value must begin * with alias/ followed by the alias name, such as - * alias/ExampleAlias. You cannot use UpdateAlias to change the - * alias name. + * alias/ExampleAlias. You cannot use UpdateAlias + * to change the alias name. *

    *

    * Constraints:
    @@ -220,7 +220,7 @@ public String getAliasName() { * Identifies the alias that is changing its KMS key. This value * must begin with alias/ followed by the alias * name, such as alias/ExampleAlias. You cannot use - * UpdateAlias to change the alias name. + * UpdateAlias to change the alias name. *

    */ public void setAliasName(String aliasName) { @@ -231,8 +231,8 @@ public void setAliasName(String aliasName) { *

    * Identifies the alias that is changing its KMS key. This value must begin * with alias/ followed by the alias name, such as - * alias/ExampleAlias. You cannot use UpdateAlias to change the - * alias name. + * alias/ExampleAlias. You cannot use UpdateAlias + * to change the alias name. *

    *

    * Returns a reference to this object so that method calls can be chained @@ -246,7 +246,7 @@ public void setAliasName(String aliasName) { * Identifies the alias that is changing its KMS key. This value * must begin with alias/ followed by the alias * name, such as alias/ExampleAlias. You cannot use - * UpdateAlias to change the alias name. + * UpdateAlias to change the alias name. *

    * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateCustomKeyStoreRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateCustomKeyStoreRequest.java index a9385039fa..318d3d54c1 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateCustomKeyStoreRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/UpdateCustomKeyStoreRequest.java @@ -76,7 +76,7 @@ *

    * This operation is part of the Custom Key Store feature feature in KMS, which combines the convenience + * >custom key store feature feature in KMS, which combines the convenience * and extensive integration of KMS with the isolation and control of a * single-tenant key store. *

    diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyRequest.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyRequest.java index 9f4d9a93a4..548d6183e9 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyRequest.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyRequest.java @@ -49,11 +49,17 @@ * You can also verify the digital signature by using the public key of the KMS * key outside of KMS. Use the GetPublicKey operation to download the * public key in the asymmetric KMS key and then use the public key to verify - * the signature outside of KMS. The advantage of using the Verify - * operation is that it is performed within KMS. As a result, it's easy to call, - * the operation is performed within the FIPS boundary, it is logged in - * CloudTrail, and you can use key policy and IAM policy to determine who is - * authorized to use the KMS key to verify signatures. + * the signature outside of KMS. To verify a signature outside of KMS with an + * SM2 public key, you must specify the distinguishing ID. By default, KMS uses + * 1234567812345678 as the distinguishing ID. For more information, + * see Offline verification with SM2 key pairs in Key Management Service + * Developer Guide. The advantage of using the Verify operation + * is that it is performed within KMS. As a result, it's easy to call, the + * operation is performed within the FIPS boundary, it is logged in CloudTrail, + * and you can use key policy and IAM policy to determine who is authorized to + * use the KMS key to verify signatures. *

    *

    * The KMS key that you use for this operation must be in a compatible key @@ -185,7 +191,8 @@ public class VerifyRequest extends AmazonWebServiceRequest implements Serializab * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA */ private String signingAlgorithm; @@ -875,7 +882,8 @@ public VerifyRequest withSignature(java.nio.ByteBuffer signature) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @return

    * The signing algorithm that was used to sign the message. If you @@ -896,7 +904,8 @@ public String getSigningAlgorithm() { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. If @@ -921,7 +930,8 @@ public void setSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. If @@ -946,7 +956,8 @@ public VerifyRequest withSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. If @@ -971,7 +982,8 @@ public void setSigningAlgorithm(SigningAlgorithmSpec signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to sign the message. If diff --git a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyResult.java b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyResult.java index 796f253853..0d07e6b0b5 100644 --- a/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyResult.java +++ b/aws-android-sdk-kms/src/main/java/com/amazonaws/services/kms/model/VerifyResult.java @@ -51,7 +51,8 @@ public class VerifyResult implements Serializable { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA */ private String signingAlgorithm; @@ -237,7 +238,8 @@ public VerifyResult withSignatureValid(Boolean signatureValid) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @return

    * The signing algorithm that was used to verify the signature. @@ -256,7 +258,8 @@ public String getSigningAlgorithm() { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to verify the signature. @@ -278,7 +281,8 @@ public void setSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to verify the signature. @@ -300,7 +304,8 @@ public VerifyResult withSigningAlgorithm(String signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to verify the signature. @@ -322,7 +327,8 @@ public void setSigningAlgorithm(SigningAlgorithmSpec signingAlgorithm) { * Constraints:
    * Allowed Values: RSASSA_PSS_SHA_256, RSASSA_PSS_SHA_384, * RSASSA_PSS_SHA_512, RSASSA_PKCS1_V1_5_SHA_256, RSASSA_PKCS1_V1_5_SHA_384, - * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512 + * RSASSA_PKCS1_V1_5_SHA_512, ECDSA_SHA_256, ECDSA_SHA_384, ECDSA_SHA_512, + * SM2DSA * * @param signingAlgorithm

    * The signing algorithm that was used to verify the signature. From 22dbc7bcd81239b8dcb97677cb1943c1ff32e9b9 Mon Sep 17 00:00:00 2001 From: Tyler Roach Date: Tue, 9 Aug 2022 15:13:04 -0400 Subject: [PATCH 11/14] Remove behavior of stopping TransferService on transfers completed, since this could be unsafe (#2973) --- .../transferutility/TransferStatusUpdater.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java index 35a6b41362..a08646d212 100644 --- a/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java +++ b/aws-android-sdk-s3/src/main/java/com/amazonaws/mobileconnectors/s3/transferutility/TransferStatusUpdater.java @@ -244,23 +244,6 @@ public void run() { } } } - - // If all transfers in local map are completed, - // stop TransferService to clear foreground notification - if (Build.VERSION.SDK_INT >= 26) { - boolean stopTransferService = true; - for (TransferRecord record : transfers.values()) { - if (!TransferState.isFinalState(record.state)) { - stopTransferService = false; - LOGGER.info("Transfers still pending, keeping TransferService running."); - break; - } - } - if (stopTransferService) { - LOGGER.info("All transfers in final state. Stopping TransferService"); - context.stopService(new Intent(context, TransferService.class)); - } - } } /** From 5a792d92f8fe428f6ed683b13879840d79ffb405 Mon Sep 17 00:00:00 2001 From: AWS Mobile SDK Bot <46607340+awsmobilesdk@users.noreply.github.com> Date: Wed, 10 Aug 2022 09:13:52 -0500 Subject: [PATCH 12/14] feat(aws-android-sdk-location): update models to latest (#2975) Co-authored-by: Erica Eaton <67125657+eeatonaws@users.noreply.github.com> --- .../services/geo/AmazonLocation.java | 10 +- .../services/geo/AmazonLocationClient.java | 10 +- .../model/BatchPutGeofenceRequestEntry.java | 41 +-- .../geo/model/CalculateRouteRequest.java | 55 +++- .../amazonaws/services/geo/model/Circle.java | 242 ++++++++++++++++++ .../services/geo/model/GeofenceGeometry.java | 95 +++++++ .../services/geo/model/GetGeofenceResult.java | 17 +- .../geo/model/GetMapGlyphsRequest.java | 14 +- .../geo/model/ListGeofenceResponseEntry.java | 17 +- .../services/geo/model/MapConfiguration.java | 90 +++++-- .../geo/model/PutGeofenceRequest.java | 45 ++-- .../services/geo/model/TruckDimensions.java | 126 +++++++++ .../model/transform/CircleJsonMarshaller.java | 55 ++++ .../transform/CircleJsonUnmarshaller.java | 60 +++++ .../GeofenceGeometryJsonMarshaller.java | 5 + .../GeofenceGeometryJsonUnmarshaller.java | 5 +- .../amazonaws/services/geo/package-info.java | 2 +- 17 files changed, 797 insertions(+), 92 deletions(-) create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java create mode 100644 aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java index 7e725beabb..44625d4bda 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocation.java @@ -22,8 +22,7 @@ /** * Interface for accessing AWS Location service *

    - * Suite of geospatial services including Maps, Places, Routes, Tracking, and - * Geofencing + * "Suite of geospatial services including Maps, Places, Routes, Tracking, and Geofencing" *

    **/ public interface AmazonLocation { @@ -403,7 +402,12 @@ BatchUpdateDevicePositionResult batchUpdateDevicePosition( * Car, or TruckModeOptions if traveling by * Truck. *

    - * + * + *

    + * If you specify walking for the travel mode and your data + * provider is Esri, the start and destination must be within 40km. + *

    + *     * * * @param calculateRouteRequest diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java index 090a2027ea..6f357af414 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/AmazonLocationClient.java @@ -35,8 +35,7 @@ * client are blocking, and will not return until the service call completes. *

    *

    - * Suite of geospatial services including Maps, Places, Routes, Tracking, and - * Geofencing + * "Suite of geospatial services including Maps, Places, Routes, Tracking, and Geofencing" *

    */ public class AmazonLocationClient extends AmazonWebServiceClient implements AmazonLocation { @@ -856,7 +855,12 @@ public BatchUpdateDevicePositionResult batchUpdateDevicePosition( * Car, or TruckModeOptions if traveling by * Truck. *

    - * + * + *

    + * If you specify walking for the travel mode and your data + * provider is Esri, the start and destination must be within 40km. + *

    + *     * * * @param calculateRouteRequest diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java index 52c10e2769..95656d01fd 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/BatchPutGeofenceRequestEntry.java @@ -37,13 +37,14 @@ public class BatchPutGeofenceRequestEntry implements Serializable { /** *

    - * Contains the polygon details to specify the position of the geofence. + * Contains the details of the position of the geofence. Can be either a + * polygon or a circle. Including both will return a validation error. *

    * *

    * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

    *     */ @@ -114,25 +115,27 @@ public BatchPutGeofenceRequestEntry withGeofenceId(String geofenceId) { /** *

    - * Contains the polygon details to specify the position of the geofence. + * Contains the details of the position of the geofence. Can be either a + * polygon or a circle. Including both will return a validation error. *

    * *

    * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

    *     * * @return

    - * Contains the polygon details to specify the position of the - * geofence. + * Contains the details of the position of the geofence. Can be + * either a polygon or a circle. Including both will return a + * validation error. *

    * *

    * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

    *     */ @@ -142,25 +145,27 @@ public GeofenceGeometry getGeometry() { /** *

    - * Contains the polygon details to specify the position of the geofence. + * Contains the details of the position of the geofence. Can be either a + * polygon or a circle. Including both will return a validation error. *

    * *

    * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

    *     * * @param geometry

    - * Contains the polygon details to specify the position of the - * geofence. + * Contains the details of the position of the geofence. Can be + * either a polygon or a circle. Including both will return a + * validation error. *

    * *

    * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

    *     */ @@ -170,13 +175,14 @@ public void setGeometry(GeofenceGeometry geometry) { /** *

    - * Contains the polygon details to specify the position of the geofence. + * Contains the details of the position of the geofence. Can be either a + * polygon or a circle. Including both will return a validation error. *

    * *

    * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

    *     *

    @@ -184,14 +190,15 @@ public void setGeometry(GeofenceGeometry geometry) { * together. * * @param geometry

    - * Contains the polygon details to specify the position of the - * geofence. + * Contains the details of the position of the geofence. Can be + * either a polygon or a circle. Including both will return a + * validation error. *

    * *

    * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

    *     * @return A reference to this updated object so that method calls can be diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java index a41c350457..ec3b29df95 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/CalculateRouteRequest.java @@ -61,7 +61,12 @@ * preferences in CarModeOptions if traveling by Car, * or TruckModeOptions if traveling by Truck. *

    - * + * + *

    + * If you specify walking for the travel mode and your data + * provider is Esri, the start and destination must be within 40km. + *

    + *     * */ public class CalculateRouteRequest extends AmazonWebServiceRequest implements Serializable { @@ -216,7 +221,9 @@ public class CalculateRouteRequest extends AmazonWebServiceRequest implements Se /** *

    * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, or Walking as options + * for the TravelMode. *

    *

    * The TravelMode you specify also determines how you specify @@ -1462,7 +1469,9 @@ public CalculateRouteRequest withIncludeLegGeometry(Boolean includeLegGeometry) /** *

    * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, or Walking as options + * for the TravelMode. *

    *

    * The TravelMode you specify also determines how you specify @@ -1491,7 +1500,9 @@ public CalculateRouteRequest withIncludeLegGeometry(Boolean includeLegGeometry) * * @return

    * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. + * estimating the speed of travel and road compatibility. You can + * choose Car, Truck, or + * Walking as options for the TravelMode. *

    *

    * The TravelMode you specify also determines how you @@ -1523,7 +1534,9 @@ public String getTravelMode() { /** *

    * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, or Walking as options + * for the TravelMode. *

    *

    * The TravelMode you specify also determines how you specify @@ -1552,7 +1565,10 @@ public String getTravelMode() { * * @param travelMode

    * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, or + * Walking as options for the + * TravelMode. *

    *

    * The TravelMode you specify also determines how @@ -1584,7 +1600,9 @@ public void setTravelMode(String travelMode) { /** *

    * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, or Walking as options + * for the TravelMode. *

    *

    * The TravelMode you specify also determines how you specify @@ -1616,7 +1634,10 @@ public void setTravelMode(String travelMode) { * * @param travelMode

    * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, or + * Walking as options for the + * TravelMode. *

    *

    * The TravelMode you specify also determines how @@ -1651,7 +1672,9 @@ public CalculateRouteRequest withTravelMode(String travelMode) { /** *

    * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, or Walking as options + * for the TravelMode. *

    *

    * The TravelMode you specify also determines how you specify @@ -1680,7 +1703,10 @@ public CalculateRouteRequest withTravelMode(String travelMode) { * * @param travelMode

    * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, or + * Walking as options for the + * TravelMode. *

    *

    * The TravelMode you specify also determines how @@ -1712,7 +1738,9 @@ public void setTravelMode(TravelMode travelMode) { /** *

    * Specifies the mode of transport when calculating a route. Used in - * estimating the speed of travel and road compatibility. + * estimating the speed of travel and road compatibility. You can choose + * Car, Truck, or Walking as options + * for the TravelMode. *

    *

    * The TravelMode you specify also determines how you specify @@ -1744,7 +1772,10 @@ public void setTravelMode(TravelMode travelMode) { * * @param travelMode

    * Specifies the mode of transport when calculating a route. Used - * in estimating the speed of travel and road compatibility. + * in estimating the speed of travel and road compatibility. You + * can choose Car, Truck, or + * Walking as options for the + * TravelMode. *

    *

    * The TravelMode you specify also determines how diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java new file mode 100644 index 0000000000..63644d6a55 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/Circle.java @@ -0,0 +1,242 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model; + +import java.io.Serializable; + +/** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + */ +public class Circle implements Serializable { + /** + *

    + * A single point geometry, specifying the center of the circle, using WGS 84 + * coordinates, in the form [longitude, latitude]. + *

    + */ + private java.util.List center; + + /** + *

    + * The radius of the circle in meters. Must be greater than zero and no + * larger than 100,000 (100 kilometers). + *

    + */ + private Double radius; + + /** + *

    + * A single point geometry, specifying the center of the circle, using WGS 84 + * coordinates, in the form [longitude, latitude]. + *

    + * + * @return

    + * A single point geometry, specifying the center of the circle, + * using WGS + * 84 coordinates, in the form + * [longitude, latitude]. + *

    + */ + public java.util.List getCenter() { + return center; + } + + /** + *

    + * A single point geometry, specifying the center of the circle, using WGS 84 + * coordinates, in the form [longitude, latitude]. + *

    + * + * @param center

    + * A single point geometry, specifying the center of the circle, + * using WGS 84 coordinates, in the form + * [longitude, latitude]. + *

    + */ + public void setCenter(java.util.Collection center) { + if (center == null) { + this.center = null; + return; + } + + this.center = new java.util.ArrayList(center); + } + + /** + *

    + * A single point geometry, specifying the center of the circle, using WGS 84 + * coordinates, in the form [longitude, latitude]. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param center

    + * A single point geometry, specifying the center of the circle, + * using WGS 84 coordinates, in the form + * [longitude, latitude]. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Circle withCenter(Double... center) { + if (getCenter() == null) { + this.center = new java.util.ArrayList(center.length); + } + for (Double value : center) { + this.center.add(value); + } + return this; + } + + /** + *

    + * A single point geometry, specifying the center of the circle, using WGS 84 + * coordinates, in the form [longitude, latitude]. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param center

    + * A single point geometry, specifying the center of the circle, + * using WGS 84 coordinates, in the form + * [longitude, latitude]. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Circle withCenter(java.util.Collection center) { + setCenter(center); + return this; + } + + /** + *

    + * The radius of the circle in meters. Must be greater than zero and no + * larger than 100,000 (100 kilometers). + *

    + * + * @return

    + * The radius of the circle in meters. Must be greater than zero and + * no larger than 100,000 (100 kilometers). + *

    + */ + public Double getRadius() { + return radius; + } + + /** + *

    + * The radius of the circle in meters. Must be greater than zero and no + * larger than 100,000 (100 kilometers). + *

    + * + * @param radius

    + * The radius of the circle in meters. Must be greater than zero + * and no larger than 100,000 (100 kilometers). + *

    + */ + public void setRadius(Double radius) { + this.radius = radius; + } + + /** + *

    + * The radius of the circle in meters. Must be greater than zero and no + * larger than 100,000 (100 kilometers). + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param radius

    + * The radius of the circle in meters. Must be greater than zero + * and no larger than 100,000 (100 kilometers). + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public Circle withRadius(Double radius) { + this.radius = radius; + return this; + } + + /** + * Returns a string representation of this object; useful for testing and + * debugging. + * + * @return A string representation of this object. + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("{"); + if (getCenter() != null) + sb.append("Center: " + getCenter() + ","); + if (getRadius() != null) + sb.append("Radius: " + getRadius()); + sb.append("}"); + return sb.toString(); + } + + @Override + public int hashCode() { + final int prime = 31; + int hashCode = 1; + + hashCode = prime * hashCode + ((getCenter() == null) ? 0 : getCenter().hashCode()); + hashCode = prime * hashCode + ((getRadius() == null) ? 0 : getRadius().hashCode()); + return hashCode; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + + if (obj instanceof Circle == false) + return false; + Circle other = (Circle) obj; + + if (other.getCenter() == null ^ this.getCenter() == null) + return false; + if (other.getCenter() != null && other.getCenter().equals(this.getCenter()) == false) + return false; + if (other.getRadius() == null ^ this.getRadius() == null) + return false; + if (other.getRadius() != null && other.getRadius().equals(this.getRadius()) == false) + return false; + return true; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java index ba51ce62a4..159883424c 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GeofenceGeometry.java @@ -21,6 +21,10 @@ *

    * Contains the geofence geometry details. *

    + *

    + * A geofence geometry is made up of either a polygon or a circle. Can be either + * a polygon or a circle. Including both will return a validation error. + *

    * *

    * Amazon Location doesn't currently support polygons with holes, multipolygons, @@ -29,6 +33,13 @@ * */ public class GeofenceGeometry implements Serializable { + /** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + */ + private Circle circle; + /** *

    * An array of 1 or more linear rings. A linear ring is an array of 4 or @@ -44,9 +55,59 @@ public class GeofenceGeometry implements Serializable { * the polygon's exterior. Inner rings must list their vertices in clockwise * order, where the left side is the polygon's interior. *

    + *

    + * A geofence polygon can consist of between 4 and 1,000 vertices. + *

    */ private java.util.List>> polygon; + /** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + * + * @return

    + * A circle on the earth, as defined by a center point and a radius. + *

    + */ + public Circle getCircle() { + return circle; + } + + /** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + * + * @param circle

    + * A circle on the earth, as defined by a center point and a + * radius. + *

    + */ + public void setCircle(Circle circle) { + this.circle = circle; + } + + /** + *

    + * A circle on the earth, as defined by a center point and a radius. + *

    + *

    + * Returns a reference to this object so that method calls can be chained + * together. + * + * @param circle

    + * A circle on the earth, as defined by a center point and a + * radius. + *

    + * @return A reference to this updated object so that method calls can be + * chained together. + */ + public GeofenceGeometry withCircle(Circle circle) { + this.circle = circle; + return this; + } + /** *

    * An array of 1 or more linear rings. A linear ring is an array of 4 or @@ -62,6 +123,9 @@ public class GeofenceGeometry implements Serializable { * the polygon's exterior. Inner rings must list their vertices in clockwise * order, where the left side is the polygon's interior. *

    + *

    + * A geofence polygon can consist of between 4 and 1,000 vertices. + *

    * * @return

    * An array of 1 or more linear rings. A linear ring is an array of @@ -78,6 +142,9 @@ public class GeofenceGeometry implements Serializable { * vertices in clockwise order, where the left side is the polygon's * interior. *

    + *

    + * A geofence polygon can consist of between 4 and 1,000 vertices. + *

    */ public java.util.List>> getPolygon() { return polygon; @@ -98,6 +165,9 @@ public java.util.List>> getPolygon() { * the polygon's exterior. Inner rings must list their vertices in clockwise * order, where the left side is the polygon's interior. *

    + *

    + * A geofence polygon can consist of between 4 and 1,000 vertices. + *

    * * @param polygon

    * An array of 1 or more linear rings. A linear ring is an array @@ -114,6 +184,10 @@ public java.util.List>> getPolygon() { * Inner rings must list their vertices in clockwise order, where * the left side is the polygon's interior. *

    + *

    + * A geofence polygon can consist of between 4 and 1,000 + * vertices. + *

    */ public void setPolygon(java.util.Collection>> polygon) { if (polygon == null) { @@ -140,6 +214,9 @@ public void setPolygon(java.util.Collection *

    + * A geofence polygon can consist of between 4 and 1,000 vertices. + *

    + *

    * Returns a reference to this object so that method calls can be chained * together. * @@ -158,6 +235,10 @@ public void setPolygon(java.util.Collection + *

    + * A geofence polygon can consist of between 4 and 1,000 + * vertices. + *

    * @return A reference to this updated object so that method calls can be * chained together. */ @@ -188,6 +269,9 @@ public GeofenceGeometry withPolygon(java.util.List>... po * order, where the left side is the polygon's interior. *

    *

    + * A geofence polygon can consist of between 4 and 1,000 vertices. + *

    + *

    * Returns a reference to this object so that method calls can be chained * together. * @@ -206,6 +290,10 @@ public GeofenceGeometry withPolygon(java.util.List>... po * Inner rings must list their vertices in clockwise order, where * the left side is the polygon's interior. *

    + *

    + * A geofence polygon can consist of between 4 and 1,000 + * vertices. + *

    * @return A reference to this updated object so that method calls can be * chained together. */ @@ -226,6 +314,8 @@ public GeofenceGeometry withPolygon( public String toString() { StringBuilder sb = new StringBuilder(); sb.append("{"); + if (getCircle() != null) + sb.append("Circle: " + getCircle() + ","); if (getPolygon() != null) sb.append("Polygon: " + getPolygon()); sb.append("}"); @@ -237,6 +327,7 @@ public int hashCode() { final int prime = 31; int hashCode = 1; + hashCode = prime * hashCode + ((getCircle() == null) ? 0 : getCircle().hashCode()); hashCode = prime * hashCode + ((getPolygon() == null) ? 0 : getPolygon().hashCode()); return hashCode; } @@ -252,6 +343,10 @@ public boolean equals(Object obj) { return false; GeofenceGeometry other = (GeofenceGeometry) obj; + if (other.getCircle() == null ^ this.getCircle() == null) + return false; + if (other.getCircle() != null && other.getCircle().equals(this.getCircle()) == false) + return false; if (other.getPolygon() == null ^ this.getPolygon() == null) return false; if (other.getPolygon() != null && other.getPolygon().equals(this.getPolygon()) == false) diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java index 28ff8a30c0..418eb119d6 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetGeofenceResult.java @@ -40,7 +40,7 @@ public class GetGeofenceResult implements Serializable { /** *

    - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

    */ private GeofenceGeometry geometry; @@ -209,11 +209,12 @@ public GetGeofenceResult withGeofenceId(String geofenceId) { /** *

    - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

    * * @return

    - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a + * circle. *

    */ public GeofenceGeometry getGeometry() { @@ -222,11 +223,12 @@ public GeofenceGeometry getGeometry() { /** *

    - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

    * * @param geometry

    - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or + * a circle. *

    */ public void setGeometry(GeofenceGeometry geometry) { @@ -235,14 +237,15 @@ public void setGeometry(GeofenceGeometry geometry) { /** *

    - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

    *

    * Returns a reference to this object so that method calls can be chained * together. * * @param geometry

    - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or + * a circle. *

    * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java index de554067e1..29b3600456 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/GetMapGlyphsRequest.java @@ -79,7 +79,7 @@ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Seri *
      *
    • *

      - * VectorHereBerlin – Fira GO Regular | + * VectorHereContrast – Fira GO Regular | * Fira GO Bold *

      *
      • @@ -173,7 +173,7 @@ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Seri *
        *
      • *

        - * VectorHereBerlin – Fira GO Regular | + * VectorHereContrast – Fira GO Regular | * Fira GO Bold *

        *
        • @@ -241,7 +241,7 @@ public class GetMapGlyphsRequest extends AmazonWebServiceRequest implements Seri *
          *
        • *

          - * VectorHereBerlin – Fira GO Regular | + * VectorHereContrast – Fira GO Regular | * Fira GO Bold *

          *
          • @@ -315,7 +315,7 @@ public String getFontStack() { *
            *
          • *

            - * VectorHereBerlin – Fira GO Regular | + * VectorHereContrast – Fira GO Regular | * Fira GO Bold *

            *
            • @@ -383,7 +383,7 @@ public String getFontStack() { *
              *
            • *

              - * VectorHereBerlin – Fira GO Regular | + * VectorHereContrast – Fira GO Regular | * Fira GO Bold *

              *
              • @@ -457,7 +457,7 @@ public void setFontStack(String fontStack) { *
                *
              • *

                - * VectorHereBerlin – Fira GO Regular | + * VectorHereContrast – Fira GO Regular | * Fira GO Bold *

                *
                • @@ -528,7 +528,7 @@ public void setFontStack(String fontStack) { *
                  *
                • *

                  - * VectorHereBerlin – Fira GO Regular | + * VectorHereContrast – Fira GO Regular | * Fira GO Bold *

                  *
                  • diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceResponseEntry.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceResponseEntry.java index dc4c46e81d..03b34467ca 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceResponseEntry.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/ListGeofenceResponseEntry.java @@ -45,7 +45,7 @@ public class ListGeofenceResponseEntry implements Serializable { /** *

                  - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

                  */ private GeofenceGeometry geometry; @@ -215,11 +215,12 @@ public ListGeofenceResponseEntry withGeofenceId(String geofenceId) { /** *

                  - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

                  * * @return

                  - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a + * circle. *

                  */ public GeofenceGeometry getGeometry() { @@ -228,11 +229,12 @@ public GeofenceGeometry getGeometry() { /** *

                  - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

                  * * @param geometry

                  - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or + * a circle. *

                  */ public void setGeometry(GeofenceGeometry geometry) { @@ -241,14 +243,15 @@ public void setGeometry(GeofenceGeometry geometry) { /** *

                  - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or a circle. *

                  *

                  * Returns a reference to this object so that method calls can be chained * together. * * @param geometry

                  - * Contains the geofence geometry details describing a polygon. + * Contains the geofence geometry details describing a polygon or + * a circle. *

                  * @return A reference to this updated object so that method calls can be * chained together. diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java index ea7d39d07b..8e31554115 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/MapConfiguration.java @@ -87,8 +87,9 @@ public class MapConfiguration implements Serializable { *
                    *
                  • *

                    - * VectorHereBerlin – The HERE Berlin map style is a high - * contrast detailed base map of the world that blends 3D and 2D rendering. + * VectorHereContrast – The HERE Contrast (Berlin) map style is + * a high contrast detailed base map of the world that blends 3D and 2D + * rendering. *

                    *
                    • *
                  • @@ -108,6 +109,13 @@ public class MapConfiguration implements Serializable { *

                    *
                    • *
                  + * + *

                  + * The VectorHereContrast style has been renamed from + * VectorHereBerlin. VectorHereBerlin has been + * deprecated, but will continue to work in applications that use it. + *

                  + *                   *

                  * Constraints:
                  * Length: 1 - 100
                  @@ -179,8 +187,9 @@ public class MapConfiguration implements Serializable { *

                    *
                  • *

                    - * VectorHereBerlin – The HERE Berlin map style is a high - * contrast detailed base map of the world that blends 3D and 2D rendering. + * VectorHereContrast – The HERE Contrast (Berlin) map style is + * a high contrast detailed base map of the world that blends 3D and 2D + * rendering. *

                    *
                    • *
                  • @@ -200,6 +209,13 @@ public class MapConfiguration implements Serializable { *

                    *
                    • *
                  + * + *

                  + * The VectorHereContrast style has been renamed from + * VectorHereBerlin. VectorHereBerlin has been + * deprecated, but will continue to work in applications that use it. + *

                  + *                   *

                  * Constraints:
                  * Length: 1 - 100
                  @@ -272,9 +288,9 @@ public class MapConfiguration implements Serializable { *

                    *
                  • *

                    - * VectorHereBerlin – The HERE Berlin map style is a - * high contrast detailed base map of the world that blends 3D and - * 2D rendering. + * VectorHereContrast – The HERE Contrast (Berlin) map + * style is a high contrast detailed base map of the world that + * blends 3D and 2D rendering. *

                    *
                    • *
                  • @@ -294,6 +310,14 @@ public class MapConfiguration implements Serializable { *

                    *
                    • *
                  + * + *

                  + * The VectorHereContrast style has been renamed from + * VectorHereBerlin. VectorHereBerlin has + * been deprecated, but will continue to work in applications that + * use it. + *

                  + *                   */ public String getStyle() { return style; @@ -363,8 +387,9 @@ public String getStyle() { *
                    *
                  • *

                    - * VectorHereBerlin – The HERE Berlin map style is a high - * contrast detailed base map of the world that blends 3D and 2D rendering. + * VectorHereContrast – The HERE Contrast (Berlin) map style is + * a high contrast detailed base map of the world that blends 3D and 2D + * rendering. *

                    *
                    • *
                  • @@ -384,6 +409,13 @@ public String getStyle() { *

                    *
                    • *
                  + * + *

                  + * The VectorHereContrast style has been renamed from + * VectorHereBerlin. VectorHereBerlin has been + * deprecated, but will continue to work in applications that use it. + *

                  + *                   *

                  * Constraints:
                  * Length: 1 - 100
                  @@ -457,9 +489,9 @@ public String getStyle() { *

                    *
                  • *

                    - * VectorHereBerlin – The HERE Berlin map style is a - * high contrast detailed base map of the world that blends 3D - * and 2D rendering. + * VectorHereContrast – The HERE Contrast (Berlin) + * map style is a high contrast detailed base map of the world + * that blends 3D and 2D rendering. *

                    *
                    • *
                  • @@ -480,6 +512,14 @@ public String getStyle() { *

                    *
                    • *
                  + * + *

                  + * The VectorHereContrast style has been renamed + * from VectorHereBerlin. + * VectorHereBerlin has been deprecated, but will + * continue to work in applications that use it. + *

                  + *                   */ public void setStyle(String style) { this.style = style; @@ -549,8 +589,9 @@ public void setStyle(String style) { *
                    *
                  • *

                    - * VectorHereBerlin – The HERE Berlin map style is a high - * contrast detailed base map of the world that blends 3D and 2D rendering. + * VectorHereContrast – The HERE Contrast (Berlin) map style is + * a high contrast detailed base map of the world that blends 3D and 2D + * rendering. *

                    *
                    • *
                  • @@ -570,6 +611,13 @@ public void setStyle(String style) { *

                    *
                    • *
                  + * + *

                  + * The VectorHereContrast style has been renamed from + * VectorHereBerlin. VectorHereBerlin has been + * deprecated, but will continue to work in applications that use it. + *

                  + *                   *

                  * Returns a reference to this object so that method calls can be chained * together. @@ -646,9 +694,9 @@ public void setStyle(String style) { *

                    *
                  • *

                    - * VectorHereBerlin – The HERE Berlin map style is a - * high contrast detailed base map of the world that blends 3D - * and 2D rendering. + * VectorHereContrast – The HERE Contrast (Berlin) + * map style is a high contrast detailed base map of the world + * that blends 3D and 2D rendering. *

                    *
                    • *
                  • @@ -669,6 +717,14 @@ public void setStyle(String style) { *

                    *
                    • *
                  + * + *

                  + * The VectorHereContrast style has been renamed + * from VectorHereBerlin. + * VectorHereBerlin has been deprecated, but will + * continue to work in applications that use it. + *

                  + *                   * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java index 690529dd7b..bcc3271081 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/PutGeofenceRequest.java @@ -51,13 +51,15 @@ public class PutGeofenceRequest extends AmazonWebServiceRequest implements Seria /** *

                  - * Contains the polygon details to specify the position of the geofence. + * Contains the details to specify the position of the geofence. Can be + * either a polygon or a circle. Including both will return a validation + * error. *

                  * *

                  * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

                  *                   */ @@ -185,25 +187,28 @@ public PutGeofenceRequest withGeofenceId(String geofenceId) { /** *

                  - * Contains the polygon details to specify the position of the geofence. + * Contains the details to specify the position of the geofence. Can be + * either a polygon or a circle. Including both will return a validation + * error. *

                  * *

                  * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

                  *                   * * @return

                  - * Contains the polygon details to specify the position of the - * geofence. + * Contains the details to specify the position of the geofence. Can + * be either a polygon or a circle. Including both will return a + * validation error. *

                  * *

                  * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

                  *                   */ @@ -213,25 +218,28 @@ public GeofenceGeometry getGeometry() { /** *

                  - * Contains the polygon details to specify the position of the geofence. + * Contains the details to specify the position of the geofence. Can be + * either a polygon or a circle. Including both will return a validation + * error. *

                  * *

                  * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

                  *                   * * @param geometry

                  - * Contains the polygon details to specify the position of the - * geofence. + * Contains the details to specify the position of the geofence. + * Can be either a polygon or a circle. Including both will + * return a validation error. *

                  * *

                  * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

                  *                   */ @@ -241,13 +249,15 @@ public void setGeometry(GeofenceGeometry geometry) { /** *

                  - * Contains the polygon details to specify the position of the geofence. + * Contains the details to specify the position of the geofence. Can be + * either a polygon or a circle. Including both will return a validation + * error. *

                  * *

                  * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

                  *                   *

                  @@ -255,14 +265,15 @@ public void setGeometry(GeofenceGeometry geometry) { * together. * * @param geometry

                  - * Contains the polygon details to specify the position of the - * geofence. + * Contains the details to specify the position of the geofence. + * Can be either a polygon or a circle. Including both will + * return a validation error. *

                  * *

                  * Each geofence polygon can have a maximum of 1,000 vertices. + * > geofence polygon can have a maximum of 1,000 vertices. *

                  *                   * @return A reference to this updated object so that method calls can be diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java index 4543464738..e3e8281d01 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/TruckDimensions.java @@ -37,6 +37,12 @@ public class TruckDimensions implements Serializable { *

                  * *
                + * + *

                + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

                + *                 *

                * Constraints:
                * Range: 0.0 -
                @@ -54,6 +60,12 @@ public class TruckDimensions implements Serializable { *

                * *
              + * + *

              + * For routes calculated with a HERE resource, this value must be between 0 + * and 300 meters. + *

              + *               *

              * Constraints:
              * Range: 0.0 -
              @@ -84,6 +96,12 @@ public class TruckDimensions implements Serializable { *

              * *
            + * + *

            + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

            + *             *

            * Constraints:
            * Range: 0.0 -
            @@ -101,6 +119,12 @@ public class TruckDimensions implements Serializable { *

            * *
          + * + *

          + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

          + *           *

          * Constraints:
          * Range: 0.0 -
          @@ -115,6 +139,12 @@ public class TruckDimensions implements Serializable { *

          * *
        + * + *

        + * For routes calculated with a HERE resource, this value must be + * between 0 and 50 meters. + *

        + *         */ public Double getHeight() { return height; @@ -131,6 +161,12 @@ public Double getHeight() { *

        * *
      + * + *

      + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

      + *       *

      * Constraints:
      * Range: 0.0 -
      @@ -145,6 +181,12 @@ public Double getHeight() { *

      * *
    + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 50 meters. + *

    + *     */ public void setHeight(Double height) { this.height = height; @@ -161,6 +203,12 @@ public void setHeight(Double height) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

    + *     *

    * Returns a reference to this object so that method calls can be chained * together. @@ -178,6 +226,12 @@ public void setHeight(Double height) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 50 meters. + *

    + *     * @return A reference to this updated object so that method calls can be * chained together. */ @@ -197,6 +251,12 @@ public TruckDimensions withHeight(Double height) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be between 0 + * and 300 meters. + *

    + *     *

    * Constraints:
    * Range: 0.0 -
    @@ -211,6 +271,12 @@ public TruckDimensions withHeight(Double height) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 300 meters. + *

    + *     */ public Double getLength() { return length; @@ -227,6 +293,12 @@ public Double getLength() { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be between 0 + * and 300 meters. + *

    + *     *

    * Constraints:
    * Range: 0.0 -
    @@ -241,6 +313,12 @@ public Double getLength() { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 300 meters. + *

    + *     */ public void setLength(Double length) { this.length = length; @@ -257,6 +335,12 @@ public void setLength(Double length) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be between 0 + * and 300 meters. + *

    + *     *

    * Returns a reference to this object so that method calls can be chained * together. @@ -274,6 +358,12 @@ public void setLength(Double length) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 300 meters. + *

    + *     * @return A reference to this updated object so that method calls can be * chained together. */ @@ -420,6 +510,12 @@ public TruckDimensions withUnit(DimensionUnit unit) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

    + *     *

    * Constraints:
    * Range: 0.0 -
    @@ -434,6 +530,12 @@ public TruckDimensions withUnit(DimensionUnit unit) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 50 meters. + *

    + *     */ public Double getWidth() { return width; @@ -450,6 +552,12 @@ public Double getWidth() { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

    + *     *

    * Constraints:
    * Range: 0.0 -
    @@ -464,6 +572,12 @@ public Double getWidth() { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 50 meters. + *

    + *     */ public void setWidth(Double width) { this.width = width; @@ -480,6 +594,12 @@ public void setWidth(Double width) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be between 0 + * and 50 meters. + *

    + *     *

    * Returns a reference to this object so that method calls can be chained * together. @@ -497,6 +617,12 @@ public void setWidth(Double width) { *

    * * + * + *

    + * For routes calculated with a HERE resource, this value must be + * between 0 and 50 meters. + *

    + *     * @return A reference to this updated object so that method calls can be * chained together. */ diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java new file mode 100644 index 0000000000..ba62b03e49 --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonMarshaller.java @@ -0,0 +1,55 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.util.DateUtils; +import com.amazonaws.util.json.AwsJsonWriter; + +/** + * JSON marshaller for POJO Circle + */ +class CircleJsonMarshaller { + + public void marshall(Circle circle, AwsJsonWriter jsonWriter) throws Exception { + jsonWriter.beginObject(); + if (circle.getCenter() != null) { + java.util.List center = circle.getCenter(); + jsonWriter.name("Center"); + jsonWriter.beginArray(); + for (Double centerItem : center) { + if (centerItem != null) { + jsonWriter.value(centerItem); + } + } + jsonWriter.endArray(); + } + if (circle.getRadius() != null) { + Double radius = circle.getRadius(); + jsonWriter.name("Radius"); + jsonWriter.value(radius); + } + jsonWriter.endObject(); + } + + private static CircleJsonMarshaller instance; + + public static CircleJsonMarshaller getInstance() { + if (instance == null) + instance = new CircleJsonMarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java new file mode 100644 index 0000000000..4d2ffe988a --- /dev/null +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/CircleJsonUnmarshaller.java @@ -0,0 +1,60 @@ +/* + * Copyright 2010-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.amazonaws.services.geo.model.transform; + +import com.amazonaws.services.geo.model.*; +import com.amazonaws.transform.SimpleTypeJsonUnmarshallers.*; +import com.amazonaws.transform.*; +import com.amazonaws.util.json.AwsJsonReader; + +/** + * JSON unmarshaller for POJO Circle + */ +class CircleJsonUnmarshaller implements Unmarshaller { + + public Circle unmarshall(JsonUnmarshallerContext context) throws Exception { + AwsJsonReader reader = context.getReader(); + if (!reader.isContainer()) { + reader.skipValue(); + return null; + } + Circle circle = new Circle(); + reader.beginObject(); + while (reader.hasNext()) { + String name = reader.nextName(); + if (name.equals("Center")) { + circle.setCenter(new ListUnmarshaller(DoubleJsonUnmarshaller.getInstance() + ) + .unmarshall(context)); + } else if (name.equals("Radius")) { + circle.setRadius(DoubleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else { + reader.skipValue(); + } + } + reader.endObject(); + return circle; + } + + private static CircleJsonUnmarshaller instance; + + public static CircleJsonUnmarshaller getInstance() { + if (instance == null) + instance = new CircleJsonUnmarshaller(); + return instance; + } +} diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java index 327c8d04f9..04e22d0153 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonMarshaller.java @@ -27,6 +27,11 @@ class GeofenceGeometryJsonMarshaller { public void marshall(GeofenceGeometry geofenceGeometry, AwsJsonWriter jsonWriter) throws Exception { jsonWriter.beginObject(); + if (geofenceGeometry.getCircle() != null) { + Circle circle = geofenceGeometry.getCircle(); + jsonWriter.name("Circle"); + CircleJsonMarshaller.getInstance().marshall(circle, jsonWriter); + } if (geofenceGeometry.getPolygon() != null) { java.util.List>> polygon = geofenceGeometry .getPolygon(); diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java index 00c019ed60..965d30af29 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/model/transform/GeofenceGeometryJsonUnmarshaller.java @@ -36,7 +36,10 @@ public GeofenceGeometry unmarshall(JsonUnmarshallerContext context) throws Excep reader.beginObject(); while (reader.hasNext()) { String name = reader.nextName(); - if (name.equals("Polygon")) { + if (name.equals("Circle")) { + geofenceGeometry.setCircle(CircleJsonUnmarshaller.getInstance() + .unmarshall(context)); + } else if (name.equals("Polygon")) { geofenceGeometry .setPolygon(new ListUnmarshaller>>( new ListUnmarshaller>( diff --git a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/package-info.java b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/package-info.java index 7eb1d9381d..08ef05bc5e 100644 --- a/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/package-info.java +++ b/aws-android-sdk-location/src/main/java/com/amazonaws/services/geo/package-info.java @@ -1,5 +1,5 @@ /** - *

    Suite of geospatial services including Maps, Places, Routes, Tracking, and Geofencing

    + *

    "Suite of geospatial services including Maps, Places, Routes, Tracking, and Geofencing"

    */ package com.amazonaws.services.geo; From d59cfd93a34836f5897fe4b0e014651cb659f510 Mon Sep 17 00:00:00 2001 From: Thomas Leing Date: Wed, 10 Aug 2022 18:09:02 -0700 Subject: [PATCH 13/14] Fix Javadocs jar file publishing using buildspec file. (#2971) Co-authored-by: Thomas Leing --- publishing.gradle | 7 +++++++ scripts/maven-release-publisher.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 scripts/maven-release-publisher.yml diff --git a/publishing.gradle b/publishing.gradle index 7e10ea55c5..1f6f4439b6 100644 --- a/publishing.gradle +++ b/publishing.gradle @@ -156,10 +156,17 @@ afterEvaluate { project -> } task androidJavadocs(type: Javadoc) { + failOnError false source = android.sourceSets.main.java.source classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) } + afterEvaluate { + androidJavadocs.classpath += files(android.libraryVariants.collect { variant -> + variant.javaCompileProvider.get().classpath.files + }) + } + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { classifier = 'javadoc' from androidJavadocs.destinationDir diff --git a/scripts/maven-release-publisher.yml b/scripts/maven-release-publisher.yml new file mode 100644 index 0000000000..6b4650eb5a --- /dev/null +++ b/scripts/maven-release-publisher.yml @@ -0,0 +1,27 @@ +version: 0.2 +env: + shell: /bin/sh + secrets-manager: + ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: awsmobilesdk/android/sonatype:username + ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: awsmobilesdk/android/sonatype:password + ORG_GRADLE_PROJECT_signingPassword: awsmobilesdk/android/signing:password + ORG_GRADLE_PROJECT_signingKeyId: awsmobilesdk/android/signing:keyId + ORG_GRADLE_PROJECT_signingInMemoryKey: awsmobilesdk/android/signing:inMemoryKey +phases: + build: + commands: + - echo 'Build phase starting.' + - | + JAVA_HOME=$JDK_8_HOME ./gradlew clean build + ./gradlew androidJavadocsJar + for task_name in $(./gradlew tasks --all | grep uploadArchives | cut -d " " -f 1); do + echo "Gradle task $task_name" + JAVA_HOME=$JDK_8_HOME ./gradlew $task_name; + done + finally: + - echo 'Build phase completed.' + post_build: + commands: + - echo 'Post-build phase starting' + finally: + - echo 'Post-build phase completed.' From 5e256870ce5271406b63e1b6ebf98fb808f4179f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 11 Aug 2022 10:19:47 -0400 Subject: [PATCH 14/14] release: AWS SDK for Android 2.51.0 (#2977) Co-authored-by: awsmobilesdk-dev+ghops --- CHANGELOG.md | 17 +++++++++++++++++ gradle.properties | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bcad2e7ee..2e695d3a41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +## [Release 2.51.0](https://github.com/aws-amplify/aws-sdk-android/releases/tag/release_v2.51.0) + +### Features +- **aws-android-sdk-iot:** update models to latest (#2968) +- **aws-android-sdk-cognitoidentityprovider:** update models to latest (#2966) +- **aws-android-sdk-polly:** update models to latest (#2959) +- **aws-android-sdk-rekognition:** update models to latest (#2957) +- **aws-android-sdk-transcribe:** update models to latest (#2953) +- **aws-android-sdk-kms:** update models to latest (#2948) +- **aws-android-sdk-location:** update models to latest (#2975) + +### Miscellaneous +- Remove behavior of stopping TransferService on transfers completed, since this could be unsafe (#2973) +- Fix Javadocs jar file publishing using buildspec file. (#2971) + +[See all changes between 2.50.1 and 2.51.0](https://github.com/aws-amplify/aws-sdk-android/compare/release_v2.50.1...release_v2.51.0) + ## [Release 2.50.1](https://github.com/aws-amplify/aws-sdk-android/releases/tag/release_v2.50.1) ### Miscellaneous diff --git a/gradle.properties b/gradle.properties index 3815a26a60..21366147d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ android.enableJetifier=true GROUP=com.amazonaws -VERSION_NAME=2.50.1 +VERSION_NAME=2.51.0 POM_URL=https://github.com/aws/aws-sdk-android POM_SCM_URL=https://github.com/aws/aws-sdk-android